Changeset 28838

Show
Ignore:
Timestamp:
13.02.2014 15:20:21 (6 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/Makefile.in

    r28837 r28838  
    5959 
    6060all: 
     61    if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 
     62      if test -d ../ext/gnome-lib; then \ 
     63        pushd ../ext/gnome-lib && source ./devel.bash && popd; \ 
     64      elif test -d ../ext/gnome-lib-minimal; then \ 
     65        pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \ 
     66      fi; \ 
     67    fi 
    6168    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
    6269      echo making $@ in $$odir; \