From 36c2230195ed6ec1e12babfc9dcf306c79ded334 Mon Sep 17 00:00:00 2001 From: erickson Date: Tue, 26 Jul 2005 14:21:58 +0000 Subject: [PATCH] added dir for xsl files, changed default prefix to 'openils' git-svn-id: svn://svn.open-ils.org/ILS/trunk@1472 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- config.sh | 16 ++++++++++------ install.conf.default | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config.sh b/config.sh index 542f9df5b9..5d14a01b47 100755 --- a/config.sh +++ b/config.sh @@ -57,11 +57,12 @@ function buildConfig { LIBDIR="$PREFIX/lib/"; PERLDIR="$LIBDIR/perl5/"; INCLUDEDIR="$PREFIX/include/"; - WEBDIR="$PREFIX/web"; - CGIDIR="$PREFIX/cgi-bin"; - ETCDIR="$PREFIX/etc"; - TEMPLATEDIR="$PREFIX/templates"; - CIRCRULESDIR="$PREFIX/circ"; + ETCDIR="$PREFIX/conf"; + WEBDIR="$PREFIX/var/web"; + CGIDIR="$PREFIX/var/cgi-bin"; + TEMPLATEDIR="$PREFIX/var/templates"; + CIRCRULESDIR="$PREFIX/var/circ"; + XSLDIR="$PREFIX/var/xsl"; prompt "Executables directory [$BINDIR] " read X; if [ ! -z "$X" ]; then BINDIR="$X"; fi; @@ -87,6 +88,9 @@ function buildConfig { prompt "Templates directory [$TEMPLATEDIR] " read X; if [ ! -z "$X" ]; then TEMPLATEDIR="$X"; fi; + prompt "XSL Stylesheets directory [$XSLDIR] " + read X; if [ ! -z "$X" ]; then XSLDIR="$X"; fi; + prompt "Custom circulation rules directory [$CIRCRULESDIR] " read X; if [ ! -z "$X" ]; then CIRCRULESDIR="$X"; fi; @@ -142,6 +146,7 @@ function writeConfig { _write "TEMPLATEDIR=\"$TEMPLATEDIR\""; _write "ETCDIR=\"$ETCDIR\""; _write "CIRCRULESDIR=\"$CIRCRULESDIR\""; + _write "XSLDIR=\"$XSLDIR\""; # print out the targets STR="TARGETS=("; @@ -166,7 +171,6 @@ function writeConfig { _write "DBPW=\"$DBPW\""; - # Now we'll write out the DB bootstrapping config CONFIG_FILE='Open-ILS/src/cgi-bin/setup.pl'; rm -f "$CONFIG_FILE"; diff --git a/install.conf.default b/install.conf.default index 41f5793539..4da7184cb3 100644 --- a/install.conf.default +++ b/install.conf.default @@ -49,7 +49,7 @@ TARGETS=("opensrf_all" "openils_all" "evergreen_core"); # libraries will be installed into PERFIX/lib, etc. The user # running 'install.sh install' must have write permissions to PREFIX # -------------------------------------------------------------------- -PREFIX="/pines/"; +PREFIX="/openils/"; BINDIR="$PREFIX/bin/"; LIBDIR="$PREFIX/lib/"; PERLDIR="$LIBDIR/perl5/"; -- 2.43.2