added an ADMINDIR config value for the django admin interface, set up the install...

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

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 8e8a2e7..ed892dc 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -62,6 +62,8 @@ server-xul:
 webcore-install:
        @echo $@
        echo "Copying web into $(WEBDIR)"
+       mkdir -p $(ADMINDIR)
+       cp -r ../admin/* $(ADMINDIR)
        mkdir -p $(WEBDIR)
        mkdir -p $(WEBDIR)/opac/extras/xsl/
        mkdir -p $(WEBDIR)/opac/extras/slimpac/

diff --git a/config.sh b/config.sh
index b142cdb..350abaa 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -59,6 +59,7 @@ function buildConfig {
        XSLDIR="$PREFIX/var/xsl";
        REPORTERDIR="$PREFIX/var/reporter";
        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;
@@ -166,6 +167,7 @@ function writeConfig {
        _write "DBUSER=\"$DBUSER\"";
        _write "DBPW=\"$DBPW\"";
        _write "REPORTERDIR=\"$REPORTERDIR\"";
+       _write "ADMINDIR=\"$ADMINDIR\"";
 
 
        # Now we'll write out the DB bootstrapping config

diff --git a/install.sh b/install.sh
index de184bc..bf9ebfa 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -120,7 +120,7 @@ function runInstall {
                        WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
                        OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
                        CIRCRULESDIR=$CIRCRULESDIR CATALOGSCRIPTDIR=$CATALOGSCRIPTDIR CGIDIR=$CGIDIR \
-                       DBDRVR=$DBDRVR DBHOST=$DBHOST DATADIR=$DATADIR\
+                       DBDRVR=$DBDRVR DBHOST=$DBHOST DATADIR=$DATADIR ADMINDIR=$ADMINDIR\
                        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";