From 875144fa72cdca6c9c67f06e9cd2504171782af1 Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 20 Jul 2005 15:58:38 +0000 Subject: [PATCH] fixed some typos, logic errors git-svn-id: svn://svn.open-ils.org/ILS/trunk@1308 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/Makefile | 2 +- config.sh | 2 +- install.conf.default | 3 ++- install.sh | 13 +++++++------ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/OpenSRF/src/Makefile b/OpenSRF/src/Makefile index 02a962ad66..e99048ba2e 100644 --- a/OpenSRF/src/Makefile +++ b/OpenSRF/src/Makefile @@ -77,7 +77,7 @@ jserver: c_utils # -------------------------------------------------------------------------------- # INSTALL # -------------------------------------------------------------------------------- -install-prep: install-prep +install-prep: @echo "Creating install directories" mkdir -p $(LIBDIR) mkdir -p $(BINDIR) diff --git a/config.sh b/config.sh index 69e2c77f6a..33f58a1f89 100755 --- a/config.sh +++ b/config.sh @@ -129,7 +129,7 @@ function writeConfig { _write "EVERGREEN_DIR=\"Evergreen/\""; prompt "To write a new config, run 'make config'"; - sleep 2; + prompt ""; } diff --git a/install.conf.default b/install.conf.default index f9dd420fa7..f367cf6348 100644 --- a/install.conf.default +++ b/install.conf.default @@ -55,7 +55,8 @@ LIBDIR="$PREFIX/lib/"; PERLDIR="$LIBDIR/perl5/"; INCLUDEDIR="$PREFIX/include/"; ETCDIR="$PREFIX/etc/"; -WEB="$PREFIX/web/"; +WEBDIR="$PREFIX/web/"; +TEMPLATEDIR="$PREFIX/templates"; # -------------------------------------------------------------------- diff --git a/install.sh b/install.sh index 2e9e92f812..9678915554 100755 --- a/install.sh +++ b/install.sh @@ -158,40 +158,41 @@ function runInstall { if installing; then $MAKE -C "$OPENSRF_DIR" "srfsh-install"; fi; ;; - "opensrf_core") + "opensrf_core" ) if installing; then $MAKE -C "$OPENSRF_DIR" "perl-install"; fi; ;; # OpenILS --- - "openils_all") + "openils_all" ) if building; then $MAKE -C "$OPENILS_DIR" all; fi; if installing; then $MAKE -C "$OPENILS_DIR" install; fi; ;; - "openils_core") + "openils_core" ) if installing; then $MAKE -C "$OPENILS_DIR" "perl-install"; $MAKE -C "$OPENILS_DIR" "string-templates-install"; fi; ;; - "openils_web") + "openils_web" ) if installing; then $MAKE -C "$OPENILS_DIR" "javascript-install"; $MAKE -C "$OPENILS_DIR" "web-templates-install"; fi; ;; - "openils_marcdumper") + "openils_marcdumper" ) if building; then $MAKE -C "$OPENILS_DIR" "marcdumper"; fi; if installing; then $MAKE -C "$OPENILS_DIR" "marcdumper-install"; fi; + ;; # Evergreen --- - "evergreen_xul_client") + "evergreen_xul_client" ) if building; then $MAKE -C "$EVERGREEN_DIR" xul; fi; ;; -- 2.43.2