Changeset 28837 for main/trunk

Timestamp:

2014-02-12T20:03:39+13:00 (10 years ago)

Author:

ak19

Message:

Reverting to revision 28636 to get GS2 to compile again with gnome-lib-minimal on Ubuntu (it compiled with gnome-lib) although everything was compiling on CentOS and didn't need these changes.

File:

• main/trunk/greenstone2/build-src/Makefile.in (modified) (1 diff)

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

@@ -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; \
-      (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