X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/86edd73d169600875a10a635ef8df4a644545b0d..7373f0185fb67dc44db465f022607bf6ebb46b4b:/pm_filter

diff --git a/pm_filter b/pm_filter
index 1e51f9dd3..7b03418ab 100755
--- a/pm_filter
+++ b/pm_filter
@@ -7,12 +7,12 @@ BEGIN {
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
-	$_=qq{our \$installdir="$prefix";};
+	$_=qq{our \$installdir="\Q$prefix\E";};
 }
 elsif (/VERSION_AUTOREPLACE/) {
-	$_=qq{our \$version="$ver";};
+	$_=qq{our \$version="\Q$ver\E";};
 }
-elsif (/^use lib/) {
+elsif (/^(?:use FindBin; *)?use lib/) {
 	# The idea here is to figure out if the libdir the Makefile.PL
 	# was configured to use is in perl's normal search path.
 	# If not, hard code it into ikiwiki.
@@ -22,12 +22,12 @@ elsif (/^use lib/) {
 		$_="";
 	}
 	else {
-		$_="use lib '$libdir';\n";
+		$_="use lib \"\Q$libdir\E\";\n";
 	}
 }
 elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) {
 	$_=qq{$1 -T\n};
 }
-elsif (/^\$ENV{PATH}="(.*)";/) {
-	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
+elsif (/^\$ENV\{PATH}="(.*)";/) {
+	$_="\$ENV{PATH}=\"\Q$1\E:\Q$prefix\E/bin\";\n";
 }