added target for installing the circ rules

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

diff --git a/Evergreen/Makefile b/Evergreen/Makefile
index e9ea275..b903290 100644 (file)
--- a/Evergreen/Makefile
+++ b/Evergreen/Makefile
@@ -7,7 +7,7 @@ IMAGE=$(WEBDIR)/images
 all:   xul 
 
 
-install:       images-install
+install:       images-install circ-install
 
 xul:
        make -C staff_client
@@ -29,5 +29,9 @@ images-install:
        ln -sf $(IMAGE)/open_book.gif $(IMAGE)/text.jpg
        ln -sf $(IMAGE)/book_icon.jpeg $(IMAGE)/"three dimensional object.jpg"
 
+circ-install:
+       mkdir -p $(CIRCRULESDIR)
+       cp circ_rules/*.rules $(CIRCRULESDIR)/
+
 clean:
        make -C staff_client clean

diff --git a/config.sh b/config.sh
index 2d5eebf..542f9df 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -51,18 +51,17 @@ function buildConfig {
        read X; if [ ! -z "$X" ]; then TMP="$X"; fi;
 
        prompt "Install prefix [$PREFIX] ";
-       read X;
-       if [ ! -z "$X" ]; then 
-               PREFIX="$X"; 
-               BINDIR="$PREFIX/bin/";
-               LIBDIR="$PREFIX/lib/";
-               PERLDIR="$LIBDIR/perl5/";
-               INCLUDEDIR="$PREFIX/include/";
-               WEBDIR="$PREFIX/web";
-               CGIDIR="$PREFIX/cgi-bin";
-               ETCDIR="$PREFIX/etc";
-               TEMPLATEDIR="$PREFIX/templates";
-       fi
+       read X; if [ ! -z "$X" ]; then PREFIX="$X"; fi
+
+       BINDIR="$PREFIX/bin/";
+       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";
 
        prompt "Executables directory [$BINDIR] "
        read X; if [ ! -z "$X" ]; then BINDIR="$X"; fi;
@@ -88,6 +87,9 @@ function buildConfig {
        prompt "Templates directory [$TEMPLATEDIR] "
        read X; if [ ! -z "$X" ]; then TEMPLATEDIR="$X"; fi;
 
+       prompt "Custom circulation rules directory [$CIRCRULESDIR] "
+       read X; if [ ! -z "$X" ]; then CIRCRULESDIR="$X"; fi;
+
        prompt "Apache2 apxs binary [$APXS2] "
        read X; if [ ! -z "$X" ]; then APXS2="$X"; fi;
 
@@ -139,6 +141,7 @@ function writeConfig {
        _write "WEBDIR=\"$WEBDIR\"";
        _write "TEMPLATEDIR=\"$TEMPLATEDIR\"";
        _write "ETCDIR=\"$ETCDIR\"";
+       _write "CIRCRULESDIR=\"$CIRCRULESDIR\"";
 
        # print out the targets
        STR="TARGETS=(";
@@ -189,6 +192,7 @@ function writeConfig {
        prompt "";
        prompt "";
        prompt "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
+       prompt "!! If installing openils_all / openils_db !!";
        prompt "!! Before running 'make install' you MUST !!";
        prompt "!! create a database for Open-ILS.  Use   !!";
        prompt "!! the settings that you listed above and !!";

diff --git a/install.conf.default b/install.conf.default
index 56bdc91..41f5793 100644 (file)
--- a/install.conf.default
+++ b/install.conf.default
@@ -41,7 +41,7 @@
 # If you only want to build the client app, then just build evergreen_xul_client.
 # --------------------------------------------------------------------
 
-TARGETS=("opensrf_all" "openils_all" "evergreen_all");
+TARGETS=("opensrf_all" "openils_all" "evergreen_core");
 
 
 # --------------------------------------------------------------------
@@ -72,7 +72,9 @@ TMP="/tmp/ilstmp/";
 # building the mod_ils_gateway C plugin for allowing web access
 # to the published API.
 # --------------------------------------------------------------------
-APXS2="/pines/apps/apache2/bin/apxs";
+
+APXS2=$(which apxs);
+if [ -z "$APXS2" ]; then APXS2="/opt/bin/apxs"; fi
 
 
 # --------------------------------------------------------------------
@@ -80,7 +82,7 @@ APXS2="/pines/apps/apache2/bin/apxs";
 # be set when building the mod_ils_gateway C plugin for allowing web 
 # access to the published API.
 # --------------------------------------------------------------------
-APACHE2_HEADERS="/pines/apps/apache2/include/";
+APACHE2_HEADERS="/opt/include/";
 
 
 # --------------------------------------------------------------------

diff --git a/install.sh b/install.sh
index 2a99f37..acea66d 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -128,7 +128,7 @@ function runInstall {
                        APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS \
                        BINDIR=$BINDIR LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
                        WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR \
-                       OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR\
+                       OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR CIRCRULESDIR=$CIRCRULESDIR\
                        CGIDIR=$CGIDIR DBDRVR=$DBDRVR DBHOST=$DBHOST DBNAME=$DBNAME DBUSER=$DBUSER DBPW=$DBPW";
 
 
@@ -203,6 +203,7 @@ function runInstall {
 
                        "evergreen_core" )
                                if installing;  then $MAKE -C "$EVERGREENDIR" "images-install"; fi;
+                               if installing;  then $MAKE -C "$EVERGREENDIR" "circ-install"; fi;
                                ;;      
 
                        "evergreen_xul_client" )