Changeset 28837

Show
Ignore:
Timestamp:
12.02.2014 20:03:39 (6 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.

Files:
1 modified

Legend:

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

    r28643 r28837  
    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 
    6861    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
    6962      echo making $@ in $$odir; \ 
    70       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
     63      if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 
     64        if test -d ../ext/gnome-lib; then \ 
     65          (pushd ../ext/gnome-lib && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
     66        elif test -d ../ext/gnome-lib-minimal; then \ 
     67          (pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
     68        fi; \ 
     69      else \ 
     70        (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
     71      fi; \ 
    7172    done 
    7273