From 00173822324b92d148070daa08dc327f096943cb Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 25 Jul 2005 19:43:25 +0000 Subject: [PATCH] more build goodness git-svn-id: svn://svn.open-ils.org/ILS/trunk@1450 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/Makefile | 24 +++++++++++++++++++++++- install.conf.default | 4 ++-- install.sh | 6 +++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/Evergreen/Makefile b/Evergreen/Makefile index 1d3b409567..e9ea275f1e 100644 --- a/Evergreen/Makefile +++ b/Evergreen/Makefile @@ -2,10 +2,32 @@ # Evergreen makefile # ------------------------------------------------------------------------ -all: xul +IMAGE=$(WEBDIR)/images + +all: xul + + +install: images-install xul: make -C staff_client +images-install: + @echo "Installing images to $(IMAGE)"; + cp -r images $(WEBDIR) + ln -sf $(IMAGE)/map.jpg $(IMAGE)/cartographic.jpg + ln -sf $(IMAGE)/bigpinesLogo.jpg $(IMAGE)/main_logo.jpg + ln -sf $(IMAGE)/open_book.gif $(IMAGE)/"mixed material.jpg" + ln -sf $(IMAGE)/movie.jpg $(IMAGE)/"moving image.jpg" + ln -sf $(IMAGE)/music_icon.jpg $(IMAGE)/"notated music.jpg" + ln -sf $(IMAGE)/smallpinesLogo.jpg $(IMAGE)/"small_logo.jpg" + ln -sf $(IMAGE)/computer.jpg $(IMAGE)/"software, multimedia.jpg" + ln -sf $(IMAGE)/speaker.gif $(IMAGE)/"sound recording-musical.jpg" + ln -sf $(IMAGE)/speaker.gif $(IMAGE)/"sound recording-nonmusical.jpg" + ln -sf $(IMAGE)/speaker.gif $(IMAGE)/"sound recording.jpg" + ln -sf $(IMAGE)/camera.gif $(IMAGE)/"still images.jpg" + ln -sf $(IMAGE)/open_book.gif $(IMAGE)/text.jpg + ln -sf $(IMAGE)/book_icon.jpeg $(IMAGE)/"three dimensional object.jpg" + clean: make -C staff_client clean diff --git a/install.conf.default b/install.conf.default index 83ba8a5a8b..56bdc91445 100644 --- a/install.conf.default +++ b/install.conf.default @@ -31,7 +31,7 @@ # openils_web - copies over the javascript and html templates to the web root directory for running the OPAC # openils_marcdumper - utility code for converting MARC to MARCXML # -# evergreen_all - builds all Evergreen components +# evergreen_cor - builds core Evergreen components (does not build evergreen_xul_client!) # evergreen_xul_client - client XUL application # # When running the server components of OpenSRF/OpenILS, the simplest @@ -41,7 +41,7 @@ # If you only want to build the client app, then just build evergreen_xul_client. # -------------------------------------------------------------------- -TARGETS=("opensrf_all" "openils_all" ); +TARGETS=("opensrf_all" "openils_all" "evergreen_all"); # -------------------------------------------------------------------- diff --git a/install.sh b/install.sh index 61ad8846a9..2a99f375ca 100755 --- a/install.sh +++ b/install.sh @@ -201,8 +201,12 @@ function runInstall { # Evergreen --- + "evergreen_core" ) + if installing; then $MAKE -C "$EVERGREENDIR" "images-install"; fi; + ;; + "evergreen_xul_client" ) - if building; then $MAKE -C "$EVERGREEN_DIR" xul; fi; + if building; then $MAKE -C "$EVERGREENDIR" xul; fi; ;; -- 2.43.2