diff options
Diffstat (limited to 'confninja.sh')
| -rw-r--r-- | confninja.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/confninja.sh b/confninja.sh index 5d01d3d..a8f69be 100644 --- a/confninja.sh +++ b/confninja.sh @@ -44,7 +44,7 @@ END # CONFIGURE echo "confargs = $CONFARGS" -echo "build build.ninja lib/JWebmail/Config.pm: configure configure confninja.sh lib/JWebmail/Config.pm.in" +echo "build build.ninja lib/JWebmail/Config.pm install/jwebmail.service: configure configure confninja.sh lib/JWebmail/Config.pm.in install/jwebmail.service.in" case "$JWM_MODE" in (development) @@ -121,8 +121,8 @@ echo "destdir = $DESTDIR" echo "prefix = $PREFIX" echo "bindir = \$prefix/bin" -echo "scriptdir = \$prefix/bin" -echo "perldir = $PERL_PATH" +echo "scriptdir = $PERL_BIN_PATH" +echo "perldir = $PERL_LIB_PATH" if [ "$PREFIX" = usr ] then echo "confdir = \$prefix/../etc" else echo "confdir = \$prefix/etc" @@ -135,7 +135,7 @@ ALL_INST= case "$MAILDIR_EXTRACTOR_NAME" in (extractrs) install_file instexec \$bindir bin jwebmail-extract;; - (extractpy) install_file instexec \$scriptdir script extract.py;; + (extractpy) install_file instexec \$bindir script extract.py;; (extractpl) install_file instexec \$scriptdir script extract.pl;; esac @@ -223,8 +223,8 @@ templates/exception_.html.ep templates/not_found.html.ep END -install_file instdata \$confdir . jwebmail.development.toml -install_file instdata \$confdir . jwebmail.production.toml +echo "build \$destdir/\$confdir/jwebmail.toml: instdata jwebmail.production.toml" +ALL_INST="$ALL_INST \$destdir/\$confdir/jwebmail.toml" for f in CHANGES.md LICENSE README.md do install_file instdata \$docdir . "$f" |