diff options
| -rwxr-xr-x | backend/dep/build_ikiwiki.sh | 5 | ||||
| -rw-r--r-- | backend/resilient/__init__.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/backend/dep/build_ikiwiki.sh b/backend/dep/build_ikiwiki.sh index 56f6325..52543f3 100755 --- a/backend/dep/build_ikiwiki.sh +++ b/backend/dep/build_ikiwiki.sh @@ -6,8 +6,9 @@ cd "$SCRIPTDIR"/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="$(pwd)/.." INSTALL_BASE="$(pwd)/.." && -perl Makefile.PL PREFIX= INSTALL_BASE="$SCRIPTDIR/prefix" && +PERL5LIB="$SCRIPTDIR/prefix/lib/perl5" perl Makefile.PL PREFIX="$SCRIPTDIR/prefix" INSTALL_BASE= && make && +make install PREFIX="$SCRIPTDIR/prefix" && echo To run ikiwiki: && -echo "PERL5LIB='$SCRIPTDIR/prefix' '$(pwd)/'ikiwiki.out" +echo "$SCRIPTDIR/prefix/bin/ikiwiki" diff --git a/backend/resilient/__init__.py b/backend/resilient/__init__.py index 27e15db..73ad2db 100644 --- a/backend/resilient/__init__.py +++ b/backend/resilient/__init__.py @@ -101,12 +101,14 @@ class ikiwiki: binary = "ikiwiki" found = (os.system("%s --version" % binary) == 0) if not found: - binary = "%s/ikiwiki/ikiwiki.out" % dep_path + binary = "%s/prefix/bin/ikiwiki" % dep_path + #binary = "%s/ikiwiki/ikiwiki.out" % dep_path 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") os.system("%s/build_ikiwiki.sh" % dep_path) + binary = "%s/prefix/bin/ikiwiki" % dep_path found = (os.system("%s --version" % binary) == 0) if not found: print("WARNING: ikiwiki not found. did build fail on this platform?") |