removed unused XUL options, updated some default paths to be more likely to match...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@6992 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/config.sh b/config.sh
index bffd162..b8095e9 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -68,15 +68,6 @@ function buildConfig {
        TMP="$(pwd)/.tmp";
        ADMINDIR="$PREFIX/var/admin";
 
-       prompt "Web domain for OPAC in Staff Client [$NEW_OPAC_URL] "
-       read X; if [ ! -z "$X" ]; then NEW_OPAC_URL="$X"; fi;
-
-       prompt "Package Name for Staff Client [$NEW_XUL_PACKAGE_NAME] "
-       read X; if [ ! -z "$X" ]; then NEW_XUL_PACKAGE_NAME="$X"; fi;
-
-       prompt "Package Label for Staff Client [$NEW_XUL_PACKAGE_LABEL] "
-       read X; if [ ! -z "$X" ]; then NEW_XUL_PACKAGE_LABEL="$X"; fi;
-
        prompt "Apache2 apxs binary [$APXS2] "
        read X; if [ ! -z "$X" ]; then APXS2="$X"; fi;
 
@@ -147,10 +138,6 @@ function writeConfig {
        _write "PENALTYRULESDIR=\"$PENALTYRULESDIR\"";
        _write "XSLDIR=\"$XSLDIR\"";
 
-       _write "NEW_OPAC_URL=\"$NEW_OPAC_URL\"";
-       _write "NEW_XUL_PACKAGE_NAME=\"$NEW_XUL_PACKAGE_NAME\"";
-       _write "NEW_XUL_PACKAGE_LABEL=\"$NEW_XUL_PACKAGE_LABEL\"";
-
        # print out the targets
        STR="TARGETS=(";
        for target in ${TARGETS[@]:0}; do

diff --git a/install.conf.default b/install.conf.default
index 02c40a4..cf511ad 100644 (file)
--- a/install.conf.default
+++ b/install.conf.default
@@ -43,7 +43,7 @@
 # If you only want to build the client app, then just build evergreen_xul_client.
 # --------------------------------------------------------------------
 
-TARGETS=("opensrf_all" "openils_all" "evergreen_core");
+TARGETS=("opensrf_all" "openils_core" "openils_web" "evergreen_core");
 
 
 # --------------------------------------------------------------------
@@ -75,7 +75,7 @@ TMP="/tmp/ilstmp/";
 # to the published API.
 # --------------------------------------------------------------------
 
-APXS2="/opt/bin/apxs"; 
+APXS2="/usr/bin/apxs2";
 
 
 # --------------------------------------------------------------------
@@ -83,8 +83,8 @@ APXS2="/opt/bin/apxs";
 # be set when building the mod_ils_gateway C plugin for allowing web 
 # access to the published API.
 # --------------------------------------------------------------------
-APACHE2_HEADERS="/opt/include/";
-APR_HEADERS="/opt/include/";
+APACHE2_HEADERS="/usr/include/apache2";
+APR_HEADERS="/usr/include/apr-1.0/";
 
 
 # --------------------------------------------------------------------