web commit by http://id.inelegant.org/: Added pm_filter patch to optionally remove -T; removed earlier, rejected patch.
parent
8bfcca5b47
commit
cfe7a0d1d7
|
@ -21,37 +21,27 @@ I imagine that there's a clean and elegant solution to this, but the hack I'm cu
|
||||||
>>> about how to use ikiwiki with $BIG_HOSTING_PROVIDER, that can mention
|
>>> about how to use ikiwiki with $BIG_HOSTING_PROVIDER, that can mention
|
||||||
>>> the option. --[[Joey]]
|
>>> the option. --[[Joey]]
|
||||||
|
|
||||||
|
>>>> I was going to write a guide for shared hosting setup anyway, so that sounds great. My `make`-fu is weak, so I don't know the Right Way to add an extra option, but here's a patch for removing the -T flag. -- Ben
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
Index: Makefile.PL
|
Index: pm_filter
|
||||||
===================================================================
|
===================================================================
|
||||||
--- Makefile.PL (revision 2630)
|
--- pm_filter (revision 2644)
|
||||||
+++ Makefile.PL (working copy)
|
+++ pm_filter (working copy)
|
||||||
@@ -24,6 +24,7 @@
|
@@ -4,6 +4,7 @@
|
||||||
)
|
$prefix=shift;
|
||||||
|
$ver=shift;
|
||||||
|
$libdir=shift;
|
||||||
|
+ $notaint=shift;
|
||||||
|
}
|
||||||
|
|
||||||
extra_build:
|
if (/INSTALLDIR_AUTOREPLACE/) {
|
||||||
+ LANG=C ./lib-fixup.pl ikiwiki.in
|
@@ -19,4 +20,7 @@
|
||||||
LANG=C ./ikiwiki.in doc html --templatedir=templates \
|
else {
|
||||||
--underlaydir=basewiki \
|
$_="use lib '$libdir';\n";
|
||||||
--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/;
|
|
||||||
+}
|
+}
|
||||||
+
|
+elsif ($. == 1 && $notaint && m{^(#!/usr/bin/perl) -T$}) {
|
||||||
|
+ $_=qq{$1\n};
|
||||||
Property changes on: lib-fixup.pl
|
}
|
||||||
___________________________________________________________________
|
|
||||||
Name: svn:executable
|
|
||||||
+ *
|
|
||||||
|
|
||||||
</pre>
|
</pre>
|
||||||
|
|
Loading…
Reference in New Issue