* Rename ikiwiki.pl so MakeMaker doesn't see it, and install it.

* Add some code to the build system that tries to determine if the
  lib installation directory is in @INC. If it's not, munge ikiwiki
  to hardcode the path to the lib directory. This should allow installing
  ikiwiki in nonstandard locations, including home directories, by just
  setting PREFIX at build time.
* Fix nested examples directory in deb.

1 files changed, 7 insertions, 1 deletions

diff --git a/pm_filter b/pm_filter
index 89449bd91..f61e7810b 100755
--- a/pm_filter
+++ b/pm_filter
@@ -3,6 +3,7 @@
 BEGIN {
 	$prefix=shift;
 	$ver=shift;
+	$libdir=shift;
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
@@ -12,5 +13,10 @@ elsif (/VERSION_AUTOREPLACE/) {
 	$_=qq{our \$version="$ver";};
 }
 elsif (/^use lib/) {
-	$_="";
+	if (grep { $_ eq $libdir } @INC) {
+		$_="";
+	}
+	else {
+		$_="use lib '$libdir';\n";
+	}
 }