Changeset 28839

Show
Ignore:
Timestamp:
13.02.2014 19:35:57 (6 years ago)
Author:
ak19
Message:

Putting the Makefile.in back to how it was in revision 28643 again, because the GS3 nightly binaries broke on linux 64 and 32 bit and mac lion and leopard. Compiling GS2 and GS3 on Ubuntu when using a gnome-lib-minimal remains a problem if using the GS2 makegs2.sh script or with GS3's ant install command, however if you source gnome-lib's devel.bash before running make for GS2 or before running ant install for GS3, it compiles successfully.

Files:
1 modified

Legend:

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

    r28838 r28839  
    6868    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
    6969      echo making $@ in $$odir; \ 
    70       if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 
    71         if test -d ../ext/gnome-lib; then \ 
    72           (pushd ../ext/gnome-lib && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    73         elif test -d ../ext/gnome-lib-minimal; then \ 
    74           (pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    75         fi; \ 
    76       else \ 
    77         (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    78       fi; \ 
     70      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    7971    done 
    8072