joey 2007-02-18 15:56:26 +00:00
parent b21b66cf51
commit f66649bca4
1 changed files with 20 additions and 18 deletions

View File

@ -3,26 +3,9 @@ I'm using Ikiwiki on a box where I don't have root access, so I install all of m
I imagine that there's a clean and elegant solution to this, but the hack I'm currently using is to have `./make` alter `ikiwki.in` before it's run, by inserting `use lib ...` lines for each of the directories in `$ENV{PERL5LIB}`. Again, this is clearly ugly, but it allows me to run `./make`, so I'm submitting it FWIW.
<pre>
Index: lib-fixup.pl
===================================================================
--- lib-fixup.pl (revision 0)
+++ lib-fixup.pl (revision 0)
@@ -0,0 +1,7 @@
+#!/usr/bin/perl -i.bak -p
+use strict;
+use warnings;
+my $libs = join('', map { "use lib '$_';\n" } split /:/, $ENV{PERL5LIB});
+s/(use IkiWiki;)/$1\n$libs/;
+
+
Property changes on: lib-fixup.pl
___________________________________________________________________
Name: svn:executable
+ *
Index: Makefile.PL
===================================================================
--- Makefile.PL (revision 2628)
--- Makefile.PL (revision 2630)
+++ Makefile.PL (working copy)
@@ -24,6 +24,7 @@
)
@ -32,5 +15,24 @@ Index: Makefile.PL
LANG=C ./ikiwiki.in doc html --templatedir=templates \
--underlaydir=basewiki \
--wikiname="ikiwiki" --verbose --no-rcs \
Index: lib-fixup.pl
===================================================================
--- lib-fixup.pl (revision 0)
+++ lib-fixup.pl (revision 0)
@@ -0,0 +1,9 @@
+#!/usr/bin/perl -i.bak -p
+use strict;
+use warnings;
+my @dirs = $ENV{PERL5LIB} =~ /:/ ? split /:/, $ENV{PERL5LIB} : $ENV{PERL5LIB};
+if (@dirs) {
+ my $libs = join('', map { " use lib '$_';\n" } @dirs);
+ s/(use IkiWiki;)/$libs$1/;
+}
+
Property changes on: lib-fixup.pl
___________________________________________________________________
Name: svn:executable
+ *
</pre>