aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-01-12 18:55:56 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-01-12 18:55:56 -0500
commit3eaa5c91d7e7d012e050e54b7ee6b27db22efb19 (patch)
tree4abe8bfae0b335c1d5cc975f15f91d1305bdfb05
parent82649be475f0d3459ea09d4fe6d65dfe212f0a80 (diff)
downloadikiwiki-3eaa5c91d7e7d012e050e54b7ee6b27db22efb19.tar
ikiwiki-3eaa5c91d7e7d012e050e54b7ee6b27db22efb19.tar.gz
export installdir
For use by Setup/Automator
-rw-r--r--IkiWiki.pm2
-rwxr-xr-xpm_filter2
2 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 4601d8590..ca483a111 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -26,7 +26,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
%pagesources %destsources);
our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
-my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
+our $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
# Optimisation.
use Memoize;
diff --git a/pm_filter b/pm_filter
index 5ee5a1b98..71f26fae8 100755
--- a/pm_filter
+++ b/pm_filter
@@ -7,7 +7,7 @@ BEGIN {
}
if (/INSTALLDIR_AUTOREPLACE/) {
- $_=qq{my \$installdir="$prefix";};
+ $_=qq{our \$installdir="$prefix";};
}
elsif (/VERSION_AUTOREPLACE/) {
$_=qq{our \$version="$ver";};