Changeset 28636 for main/trunk/greenstone2/build-src/Makefile.in

Timestamp:

2013-11-18T21:45:29+13:00 (10 years ago)

Author:

ak19

Message:

As part of getting diffcol to work with GS3, GS3 needs to be compiled up, for which the following changes were made: 1. Modifications to build.properties and build.xml to checkout and set up gnome-lib-minimal and still pass the --enable-gnome-lib-ext flag to build-src/configure.in. 2. Fixing up build-src/Makefile.in so that sourcing gnome-lib can work on Ubuntu, which uses dash instead of bash and so does not recongise pushd/popd or source (only the dot). To get the build-src Makefile to work on Ubuntu, Makefile.in now sets the SHELL to be bin/bash for running make, and then executes the commands for sourcing gnome-lib in the same subshell as the one which compiles up build-src subdirs like wvware.

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
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -58 +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; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+      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; \
     done