aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile.PL7
-rw-r--r--doc/todo/location_of_ikiwiki-w3m.cgi.mdwn2
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 2137b9dde..d92d54d1e 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,6 +23,9 @@ PROBABLE_INST_LIB=$(shell \\
fi \\
)
+# Additional configurable path variables.
+W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
+
tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
@@ -94,8 +97,8 @@ extra_install:
install -d $(DESTDIR)$(PREFIX)/sbin
install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
- install -d $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
- install ikiwiki-w3m.cgi $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
+ install -d $(DESTDIR)$(W3M_CGI_BIN)
+ install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
install -d $(DESTDIR)$(PREFIX)/bin
install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
diff --git a/doc/todo/location_of_ikiwiki-w3m.cgi.mdwn b/doc/todo/location_of_ikiwiki-w3m.cgi.mdwn
index 6e1941c91..2ccb7b088 100644
--- a/doc/todo/location_of_ikiwiki-w3m.cgi.mdwn
+++ b/doc/todo/location_of_ikiwiki-w3m.cgi.mdwn
@@ -1 +1,3 @@
The ikiwiki-w3m.cgi script is installed (hard-coded) into /usr/lib/w3m/cgi-bin/. On Fedora however, the w3m package expects it in /usr/libexec/w3m/cgi-bin. So, it would be nice if the destination for this script could be configured.
+
+> You can use W3M_CGI_BIN now. [[done]] --[[Joey]]