From c9d8d12bc837261238a643e5c6fdea061057c6a2 Mon Sep 17 00:00:00 2001
From: IkiWiki <ikiwiki.info>
Date: Mon, 2 Mar 2020 16:22:10 -0500
Subject: not sure where i am in this, another task came up, but committing
changes
---
backend/dep/build_ikiwiki.sh | 7 ++++---
backend/resilient/__init__.py | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'backend')
diff --git a/backend/dep/build_ikiwiki.sh b/backend/dep/build_ikiwiki.sh
index 484613a..56f6325 100755
--- a/backend/dep/build_ikiwiki.sh
+++ b/backend/dep/build_ikiwiki.sh
@@ -3,10 +3,11 @@
SCRIPTDIR="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )"
cd "$SCRIPTDIR"/ikiwiki &&
-PERL5LIB="$(pwd):$(pwd)/cpan" PERL_MM_USE_DEFAULT=1 perl -MCPAN -MCPAN::MyConfig -e 'CPAN::Shell->notest("install", "Bundle::IkiWiki")' &&
+HOME="$SCRIPTDIR/prefix" PERL5LIB="$(pwd):$(pwd)/cpan" PERL_MM_USE_DEFAULT=1 perl -MCPAN -MCPAN::MyConfig -e 'CPAN::Shell->notest("install", "Bundle::IkiWiki")' &&
#PERL5LIB="$(pwd):$(pwd)/cpan" PERL_MM_USE_DEFAULT=1 perl -MCPAN -MCPAN::MyConfig -e 'CPAN::Shell->notest("install", "Bundle::IkiWiki::Extras")' &&
-perl Makefile.PL PREFIX= INSTALL_BASE= &&
+#perl Makefile.PL PREFIX="$(pwd)/.." INSTALL_BASE="$(pwd)/.." &&
+perl Makefile.PL PREFIX= INSTALL_BASE="$SCRIPTDIR/prefix" &&
make &&
echo To run ikiwiki: &&
-echo "PERL5LIB='$(pwd)' '$(pwd)/'ikiwiki.out"
+echo "PERL5LIB='$SCRIPTDIR/prefix' '$(pwd)/'ikiwiki.out"
diff --git a/backend/resilient/__init__.py b/backend/resilient/__init__.py
index e9ea49c..27e15db 100644
--- a/backend/resilient/__init__.py
+++ b/backend/resilient/__init__.py
@@ -102,7 +102,7 @@ class ikiwiki:
found = (os.system("%s --version" % binary) == 0)
if not found:
binary = "%s/ikiwiki/ikiwiki.out" % dep_path
- os.environ['PERL5LIB'] = os.path.join(dep_path, 'ikiwiki')
+ os.environ['PERL5LIB'] = os.path.join(dep_path, 'prefix', 'lib', 'perl5')
found = (os.system("%s --version" % binary) == 0)
if not found:
print("ikiwiki not found: attempting to build")
--
cgit v1.2.3