Changeset 28643 for main/trunk/greenstone2/build-src

Timestamp:

2013-11-19T14:59:12+13:00 (10 years ago)

Author:

ak19

Message:

Reverting to 28635, but gs2build/build-src/Makefile.in now still sets the SHELL makefile variable so that pushd and source work with dash (Ubuntu Makefiles use dash instead of bash).

File:

• main/trunk/greenstone2/build-src/Makefile.in (modified) (2 diffs)

main/trunk/greenstone2/build-src/Makefile.in

@@ -26 +26 @@
 srcdir = @srcdir@
 
-SHELL=/bin/bash
+SHELL = /bin/bash
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -59 +59 @@
 
 all:
+    if test $(ENABLE_GNOMELIB_EXT) = 1; then \
+      if test -d ../ext/gnome-lib; then \
+        pushd ../ext/gnome-lib && source ./devel.bash && popd; \
+      elif test -d ../ext/gnome-lib-minimal; then \
+        pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \
+      fi; \
+    fi
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \
-      if test $(ENABLE_GNOMELIB_EXT) = 1; then \
-        if test -d ../ext/gnome-lib; then \
-          (pushd ../ext/gnome-lib && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
-        elif test -d ../ext/gnome-lib-minimal; then \
-          (pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
-        fi; \
-      else \
-        (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
-      fi; \
+      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done