Changeset 28838

Timestamp:

2014-02-13T15:20:21+13:00 (10 years ago)

Author:

ak19

Message:

Commit 28837 to do with setting the gnome-lib-minimal env for wvware on Ubuntu (and which still worked on CentOS) when it come to GS2, broke the nightly GS3 binary generation on linux and mac, so now the build-src/Makefile.in contains both the changes made in 28837 and the lines of instructions that existed before. Need to test by generating the GS3 binaries

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