small tweaks and changes to make the install process more useful

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

diff --git a/Evergreen/Makefile b/Evergreen/Makefile
index bd95f3a..1d3b409 100644 (file)
--- a/Evergreen/Makefile
+++ b/Evergreen/Makefile
@@ -6,3 +6,6 @@ all:    xul
 
 xul:
        make -C staff_client
+
+clean:
+       make -C staff_client clean

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 2a6e1fc..3952236 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -9,12 +9,17 @@ marcdumper-install:
        make -C extras/marcdumper install
 
 perl-install:
+       mkdir -p $(PERLDIR)
        cp -r perlmods/* $(PERLDIR)
 
 javascript-install:
+       mkdir -p $(WEBDIR)
        cp -r javascript/* $(WEBDIR)
+       cp ../../$(OPENSRFDIR)/javascript/JSON.js $(WEBDIR)/util/
+       cp ../../$(OPENSRFDIR)/javascript/md5.js $(WEBDIR)/util/
 
 web-templates-install:
+       mkdir -p $(TEMPLATEDIR)
        cp -r templates/opac $(TEMPLATEDIR)
        cp -r templates/html $(TEMPLATEDIR)
 

diff --git a/Open-ILS/src/extras/Makefile b/Open-ILS/src/extras/Makefile
new file mode 100644 (file)
index 0000000..b711f39
--- /dev/null
+++ b/Open-ILS/src/extras/Makefile
@@ -0,0 +1,4 @@
+all:
+
+
+clean:

diff --git a/Open-ILS/src/extras/marcdumper/Makefile b/Open-ILS/src/extras/marcdumper/Makefile
index 3fdf45c..62d45b3 100644 (file)
--- a/Open-ILS/src/extras/marcdumper/Makefile
+++ b/Open-ILS/src/extras/marcdumper/Makefile
@@ -12,6 +12,7 @@ marcdumper:  marcdumper.c
        $(CC) marcdumper.c $(COMP) $(LD) -o $@
 
 install: 
+       mkdir -p $(BINDIR)
        cp marcdumper $(BINDIR)
 
 clean:

diff --git a/OpenSRF/src/Makefile b/OpenSRF/src/Makefile
index e99048b..1d18904 100644 (file)
--- a/OpenSRF/src/Makefile
+++ b/OpenSRF/src/Makefile
@@ -84,6 +84,8 @@ install-prep:
        mkdir -p $(PERLDIR)
        mkdir -p $(INCLUDEDIR)
        mkdir -p $(INCLUDEDIR)/$(OPENSRF)
+       mkdir -p $(ETCDIR)
+       mkdir -p $(TEMPLATEDIR)
 
 transport-install:     install-prep utils-install
        make -C libtransport install

diff --git a/OpenSRF/src/gateway/Makefile b/OpenSRF/src/gateway/Makefile
index 6af77eb..1ae63e4 100644 (file)
--- a/OpenSRF/src/gateway/Makefile
+++ b/OpenSRF/src/gateway/Makefile
@@ -5,6 +5,7 @@ all: libmod_ils_gateway.so
 
 install: 
        cp $(TMPDIR)/libmod_ils_gateway.so $(LIBDIR)/libmod_ils_gateway.so
+       cp gateway.xml.example $(ETCDIR)
        $(APXS2) -i -a -n ils_gateway $(LIBDIR)/libmod_ils_gateway.so
 
 libmod_ils_gateway.so: mod_ils_gateway.c       

diff --git a/OpenSRF/src/router/Makefile b/OpenSRF/src/router/Makefile
index fa416c3..c1c5e12 100644 (file)
--- a/OpenSRF/src/router/Makefile
+++ b/OpenSRF/src/router/Makefile
@@ -9,6 +9,7 @@ all: router
 
 install: 
        cp router $(BINDIR)
+       cp router_config.xml.example $(ETCDIR)
 
 router:  router.c $(LIB_SOURCES)
        $(CC) $(LD_OPTS) -D_ROUTER $(CC_OPTS)   $(LIB_SOURCES) router.c -o $@ 

diff --git a/config.sh b/config.sh
index 33f58a1..522aeee 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -57,6 +57,9 @@ function buildConfig {
                LIBDIR="$PREFIX/lib/";
                PERLDIR="$LIBDIR/perl5/";
                INCLUDEDIR="$PREFIX/include/";
+               WEBDIR="$PREFIX/web";
+               ETCDIR="$PREFIX/etc";
+               TEMPLATEDIR="$PREFIX/templates";
        fi
 
        prompt "Executables directory [$BINDIR] "
@@ -115,6 +118,7 @@ function writeConfig {
 
        _write "WEBDIR=\"$WEBDIR\"";
        _write "TEMPLATEDIR=\"$TEMPLATEDIR\"";
+       _write "ETCDIR=\"$ETCDIR\"";
 
        # print out the targets
        STR="TARGETS=(";
@@ -124,9 +128,9 @@ function writeConfig {
        STR="$STR)";
        _write "$STR";
 
-       _write "OPENSRF_DIR=\"OpenSRF/src/\"";
-       _write "OPENILS_DIR=\"Open-ILS/src/\"";
-       _write "EVERGREEN_DIR=\"Evergreen/\"";
+       _write "OPENSRFDIR=\"OpenSRF/src/\"";
+       _write "OPENILSDIR=\"Open-ILS/src/\"";
+       _write "EVERGREENDIR=\"Evergreen/\"";
 
        prompt "To write a new config, run 'make config'";
        prompt "";

diff --git a/install.conf.default b/install.conf.default
index f367cf6..d503b64 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");
+TARGETS=("opensrf_all" "openils_all" );
 
 
 # --------------------------------------------------------------------
@@ -94,7 +94,7 @@ LIBXML2_HEADERS="/usr/include/libxml2/";
 # These point to the top level makefiles for each of the sub 
 # projects.  Only change these if you have relocated the directories.
 # --------------------------------------------------------------------
-OPENSRF_DIR="OpenSRF/src/";
-OPENILS_DIR="Open-ILS/src/";
-EVERGREEN_DIR="Evergreen/";
+OPENSRFDIR="OpenSRF/src/";
+OPENILSDIR="Open-ILS/src/";
+EVERGREENDIR="Evergreen/";
 

diff --git a/install.sh b/install.sh
index 9678915..08234d2 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -127,66 +127,67 @@ function runInstall {
                MAKE="make APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP \
                        APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS \
                        BINDIR=$BINDIR LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
-                       WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR";
+                       WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR \
+                       OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR";
 
                case "$target" in
        
                        # OpenSRF ---                   
 
                        "opensrf_all")
-                               if building;    then $MAKE -C "$OPENSRF_DIR" all; fi;
-                               if installing; then $MAKE -C "$OPENSRF_DIR" install; fi;
+                               if building;    then $MAKE -C "$OPENSRFDIR" all; fi;
+                               if installing; then $MAKE -C "$OPENSRFDIR" install; fi;
                                ;;
 
                        "opensrf_jserver" )
-                               if building;    then $MAKE -C "$OPENSRF_DIR" "jserver"; fi;
-                               if installing; then $MAKE -C "$OPENSRF_DIR" "jserver-install"; fi;
+                               if building;    then $MAKE -C "$OPENSRFDIR" "jserver"; fi;
+                               if installing; then $MAKE -C "$OPENSRFDIR" "jserver-install"; fi;
                                ;;      
 
                        "opensrf_router" ) 
-                               if building;    then $MAKE -C "$OPENSRF_DIR" "router"; fi;
-                               if installing; then $MAKE -C "$OPENSRF_DIR" "router-install"; fi;
+                               if building;    then $MAKE -C "$OPENSRFDIR" "router"; fi;
+                               if installing; then $MAKE -C "$OPENSRFDIR" "router-install"; fi;
                                ;;
 
                        "opensrf_gateway" )
-                               if building;    then $MAKE -C "$OPENSRF_DIR" "gateway"; fi;
-                               if installing; then $MAKE -C "$OPENSRF_DIR" "gateway-install"; fi;
+                               if building;    then $MAKE -C "$OPENSRFDIR" "gateway"; fi;
+                               if installing; then $MAKE -C "$OPENSRFDIR" "gateway-install"; fi;
                                ;;
 
                        "opensrf_srfsh" ) 
-                               if building;    then $MAKE -C "$OPENSRF_DIR" "srfsh"; fi;
-                               if installing; then $MAKE -C "$OPENSRF_DIR" "srfsh-install"; fi;
+                               if building;    then $MAKE -C "$OPENSRFDIR" "srfsh"; fi;
+                               if installing; then $MAKE -C "$OPENSRFDIR" "srfsh-install"; fi;
                                ;;
 
                        "opensrf_core" )
-                               if installing; then $MAKE -C "$OPENSRF_DIR" "perl-install"; fi;
+                               if installing; then $MAKE -C "$OPENSRFDIR" "perl-install"; fi;
                                ;;
 
 
                        # OpenILS ---                   
 
                        "openils_all" )
-                               if building;    then $MAKE -C "$OPENILS_DIR" all; fi;
-                               if installing; then $MAKE -C "$OPENILS_DIR" install; fi;
+                               if building;    then $MAKE -C "$OPENILSDIR" all; fi;
+                               if installing; then $MAKE -C "$OPENILSDIR" install; fi;
                                ;;
 
                        "openils_core" )
                                if installing; then 
-                                       $MAKE -C "$OPENILS_DIR" "perl-install"; 
-                                       $MAKE -C "$OPENILS_DIR" "string-templates-install"; 
+                                       $MAKE -C "$OPENILSDIR" "perl-install"; 
+                                       $MAKE -C "$OPENILSDIR" "string-templates-install"; 
                                fi;
                                ;;
 
                        "openils_web" )
                                if installing; then 
-                                       $MAKE -C "$OPENILS_DIR" "javascript-install"; 
-                                       $MAKE -C "$OPENILS_DIR" "web-templates-install"; 
+                                       $MAKE -C "$OPENILSDIR" "javascript-install"; 
+                                       $MAKE -C "$OPENILSDIR" "web-templates-install"; 
                                fi;
                                ;;
 
                        "openils_marcdumper" )
-                               if building;    then $MAKE -C "$OPENILS_DIR" "marcdumper"; fi;
-                               if installing; then $MAKE -C "$OPENILS_DIR" "marcdumper-install"; fi;
+                               if building;    then $MAKE -C "$OPENILSDIR" "marcdumper"; fi;
+                               if installing; then $MAKE -C "$OPENILSDIR" "marcdumper-install"; fi;
                                ;;
 
 
@@ -241,9 +242,9 @@ function checkParams {
 
 function cleanMe {
        loadConfig;
-       make -C "$OPENSRF_DIR" clean;
-       make -C "$OPENILS_DIR"  clean;
-       make -C "$EVERGREEN_DIR" clean;
+       make -C "$OPENSRFDIR" clean;
+       make -C "$OPENILSDIR"  clean;
+       make -C "$EVERGREENDIR" clean;
 }
 
 checkParams "$@";