Ignore:
Timestamp:
11/18/13 21:45:29 (7 years ago)
Author:
ak19
Message:

As part of getting diffcol to work with GS3, GS3 needs to be compiled up, for which the following changes were made: 1. Modifications to build.properties and build.xml to checkout and set up gnome-lib-minimal and still pass the --enable-gnome-lib-ext flag to build-src/configure.in. 2. Fixing up build-src/Makefile.in so that sourcing gnome-lib can work on Ubuntu, which uses dash instead of bash and so does not recongise pushd/popd or source (only the dot). To get the build-src Makefile to work on Ubuntu, Makefile.in now sets the SHELL to be bin/bash for running make, and then executes the commands for sourcing gnome-lib in the same subshell as the one which compiles up build-src subdirs like wvware.

File:
1 edited

Legend:

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

    r28308 r28636  
    2626srcdir = @srcdir@
    2727
     28SHELL=/bin/bash
    2829PACKAGE = @PACKAGE@
    2930VERSION = @VERSION@
     
    5859
    5960all:
    60     if test $(ENABLE_GNOMELIB_EXT) = 1; then \
    61       if test -d ../ext/gnome-lib; then \
    62         pushd ../ext/gnome-lib && source ./devel.bash && popd; \
    63       elif test -d ../ext/gnome-lib-minimal; then \
    64         pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \
    65       fi; \
    66     fi
    6761    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
    6862      echo making $@ in $$odir; \
    69       (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; \
    7072    done
    7173
Note: See TracChangeset for help on using the changeset viewer.