added install config info for the penalty scripts

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

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index d21ba21..19e2d9f 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -16,7 +16,10 @@ web-install: webcore-install autojs-install mod_ils_rest_gateway-install  mod_xm
 
 circ_rules-install:
        @echo $@
+       mkdir -p $(CIRCRULESDIR)
+       mkdir -p $(PENALTYRULESDIR)
        cp javascript/backend/circ/*.js $(CIRCRULESDIR)
+       cp javascript/backend/penalty/*.js $(PENALTYRULESDIR)
 
 
 # -----------------------------------------------------------------------------------

diff --git a/config.sh b/config.sh
index ede808e..fb29b3c 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -54,6 +54,7 @@ function buildConfig {
        CGIDIR="$PREFIX/var/cgi-bin";
        TEMPLATEDIR="$PREFIX/var/templates";
        CIRCRULESDIR="$PREFIX/var/circ";
+       PENALTYRULESDIR="$PREFIX/var/penalty";
        XSLDIR="$PREFIX/var/xsl";
        REPORTERDIR="$PREFIX/var/reporter";
        TMP="$(pwd)/.tmp";
@@ -130,6 +131,7 @@ function writeConfig {
        _write "TEMPLATEDIR=\"$TEMPLATEDIR\"";
        _write "ETCDIR=\"$ETCDIR\"";
        _write "CIRCRULESDIR=\"$CIRCRULESDIR\"";
+       _write "PENALTYRULESDIR=\"$PENALTYRULESDIR\"";
        _write "XSLDIR=\"$XSLDIR\"";
 
        _write "NEW_OPAC_URL=\"$NEW_OPAC_URL\"";

diff --git a/install.sh b/install.sh
index ecd8322..9c7f774 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -122,7 +122,7 @@ function runInstall {
                        WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
                        OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
                        CIRCRULESDIR=$CIRCRULESDIR CGIDIR=$CGIDIR DBDRVR=$DBDRVR DBHOST=$DBHOST DATADIR=$DATADIR\
-                       DBNAME=$DBNAME DBUSER=$DBUSER DBPW=$DBPW XSLDIR=$XSLDIR NEW_OPAC_URL=$NEW_OPAC_URL \
+                       PENALTYRULESDIR=$PENALTYRULESDIR DBNAME=$DBNAME DBUSER=$DBUSER DBPW=$DBPW XSLDIR=$XSLDIR NEW_OPAC_URL=$NEW_OPAC_URL \
                        NEW_XUL_PACKAGE_NAME=$NEW_XUL_PACKAGE_NAME NEW_XUL_PACKAGE_LABEL=$NEW_XUL_PACKAGE_LABEL";
 
 
@@ -181,7 +181,6 @@ function runInstall {
 
                        "openils_web" )
                                if building; then $MAKE -C "$OPENILSDIR" "mod_xmlent"; fi;
-                               if building; then $MAKE -C "$OPENILSDIR" "mod_xmlbuilder"; fi;
                                if building; then $MAKE -C "$OPENILSDIR" "mod_ils_rest_gateway"; fi;
                                if installing; then
                                        $MAKE -C "$OPENILSDIR" "web-install";