added catalog scripts to build process

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

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index d32cc88..f62aa61 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -18,8 +18,10 @@ circ_rules-install:
        @echo $@
        mkdir -p $(CIRCRULESDIR)
        mkdir -p $(PENALTYRULESDIR)
+       mkdir -p $(CATALOGSCRIPTDIR)
        cp javascript/backend/circ/*.js $(CIRCRULESDIR)
        cp javascript/backend/penalty/*.js $(PENALTYRULESDIR)
+       cp javascript/backend/catalog/*.js $(CATALOGSCRIPTDIR)
 
 
 # -----------------------------------------------------------------------------------
@@ -179,8 +181,8 @@ xsl-install:
        @echo "Installing XSL files to $(XSLDIR)"
        mkdir -p $(XSLDIR)
        cp ../xsl/*.xsl $(XSLDIR)
-       mkdir -p $(WEBDIR)/xsl/
-       cp ../xsl/*.xsl $(WEBDIR)/xsl/
+#      mkdir -p $(WEBDIR)/xsl/
+#      cp ../xsl/*.xsl $(WEBDIR)/xsl/
 
 clean:
        @echo $@

diff --git a/config.sh b/config.sh
index 83b8947..b142cdb 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";
+       CATALOGSCRIPTDIR="$PREFIX/var/catalog";
        PENALTYRULESDIR="$PREFIX/var/penalty";
        XSLDIR="$PREFIX/var/xsl";
        REPORTERDIR="$PREFIX/var/reporter";
@@ -134,6 +135,7 @@ function writeConfig {
        _write "TEMPLATEDIR=\"$TEMPLATEDIR\"";
        _write "ETCDIR=\"$ETCDIR\"";
        _write "CIRCRULESDIR=\"$CIRCRULESDIR\"";
+       _write "CATALOGSCRIPTDIR=\"$CATALOGSCRIPTDIR\"";
        _write "PENALTYRULESDIR=\"$PENALTYRULESDIR\"";
        _write "XSLDIR=\"$XSLDIR\"";
 

diff --git a/install.sh b/install.sh
index 9d741f6..ee086ba 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -121,7 +121,8 @@ function runInstall {
                        BINDIR=$BINDIR LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
                        WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
                        OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
-                       CIRCRULESDIR=$CIRCRULESDIR CGIDIR=$CGIDIR DBDRVR=$DBDRVR DBHOST=$DBHOST DATADIR=$DATADIR\
+                       CIRCRULESDIR=$CIRCRULESDIR CATALOGSCRIPTDIR=$CATALOGSCRIPTDIR CGIDIR=$CGIDIR \
+                       DBDRVR=$DBDRVR DBHOST=$DBHOST DATADIR=$DATADIR\
                        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";