Changeset 13731


Ignore:
Timestamp:
2007-01-23T11:24:51+13:00 (15 years ago)
Author:
kjdon
Message:

changes to use new indexers repository and not mg/mgpp from gs2

Location:
trunk/gs2build-extra
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/gs2build-extra/Makefile.in

    r9749 r13731  
    11###########################################################################
    22#
    3 # Makefile -- gsdl
     3# Makefile -- gs2build module
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
     
    4747ALLFILES = $(OBJECTS)
    4848
    49 #INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile src/getpw packages/mg src/phind/generate packages src/mgpp src/oaiservr
    50 INSTALLDIRS = src/txt2db src/db2txt src/hashfile packages/mg src/phind/generate packages src/mgpp
     49INSTALLDIRS = indexers src/txt2db src/db2txt src/hashfile src/phind/generate packages
    5150
    5251MODULEDIRS = @MODULEDIRS@
    5352
    54 #OTHERDIRS = packages packages/mg lib src/mgpp src/colservr src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/oaiservr
     53OTHERDIRS = lib
    5554
    56 OTHERDIRS = packages packages/mg lib src/mgpp src/txt2db src/db2txt src/hashfile src/phind/generate
    5755all:
    58     for odir in $(OTHERDIRS) $(MODULEDIRS); do \
     56    for odir in $(OTHERDIRS) $(INSTALLDIRS) $(MODULEDIRS); do \
    5957      echo making $@ in $$odir; \
    6058      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
  • trunk/gs2build-extra/configure

    r13509 r13731  
    310310#endif"
    311311
    312 ac_subdirs_all="$ac_subdirs_all packages"
     312ac_subdirs_all="$ac_subdirs_all packages indexers"
    313313ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION ENABLE_ACCENTFOLD CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
    314314ac_subst_files=''
     
    72947294# ---------------------------------------------------------------------------
    72957295
    7296 
    7297 subdirs="$subdirs packages"
     7296# indexers needs bindir option to get the binaries into the
     7297# right place
     7298gsdlprefix=`pwd`
     7299ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
     7300
     7301
     7302
     7303subdirs="$subdirs packages indexers"
    72987304
    72997305
    73007306# the list of folders in the src folder
    7301 srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile src/hashfile/Makefile src/txt2db/Makefile src/db2txt/Makefile src/phind/generate/Makefile "
    7302 
    7303                                                                                                     ac_config_files="$ac_config_files packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile packages/mg/src/scripts/Makefile packages/mg/lib/Makefile lib/Makefile Makefile $srclist $moduleDirs"
     7307srclist="src/hashfile/Makefile src/txt2db/Makefile src/db2txt/Makefile src/phind/generate/Makefile "
     7308
     7309                                                  ac_config_files="$ac_config_files packages/Makefile lib/Makefile Makefile $srclist $moduleDirs"
    73047310cat >confcache <<\_ACEOF
    73057311# This file is a shell script that caches the results of configure
     
    78287834  # Handling of arguments.
    78297835  "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
    7830   "packages/mg/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/Makefile" ;;
    7831   "packages/mg/src/text/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/text/Makefile" ;;
    7832   "packages/mg/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/images/Makefile" ;;
    7833   "packages/mg/src/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/scripts/Makefile" ;;
    7834   "packages/mg/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/lib/Makefile" ;;
    78357836  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
    78367837  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  • trunk/gs2build-extra/configure.in

    r13508 r13731  
    344344dnl not needed any more?
    345345dnl ac_configure_args="$ac_configure_args --build=$build --target=$target"
    346 AC_CONFIG_SUBDIRS(packages)
     346
     347# indexers needs bindir option to get the binaries into the
     348# right place
     349gsdlprefix=`pwd`
     350ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
     351
     352AC_CONFIG_SUBDIRS(packages indexers)
    347353
    348354# the list of folders in the src folder
    349 srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile src/hashfile/Makefile src/txt2db/Makefile src/db2txt/Makefile src/phind/generate/Makefile "
    350 
    351 AC_OUTPUT(packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile packages/mg/src/scripts/Makefile packages/mg/lib/Makefile lib/Makefile Makefile $srclist $moduleDirs)
     355srclist="src/hashfile/Makefile src/txt2db/Makefile src/db2txt/Makefile src/phind/generate/Makefile "
     356
     357AC_OUTPUT(packages/Makefile lib/Makefile Makefile $srclist $moduleDirs)
  • trunk/gs2build-extra/lib.Makefile.in

    r9758 r13731  
    3232CCFLAGS = @CFLAGS@
    3333DEFS = @DEFS@
    34 INCLUDES = -I../packages/mg/lib -I..
     34INCLUDES = -I../indexers/mg/lib -I..
    3535RANLIB = @RANLIB@
    3636
  • trunk/gs2build-extra/packages.Makefile.in

    r13510 r13731  
    3030# clean, and distclean.
    3131
    32 ENABLE_ACCENTFOLD=@ENABLE_ACCENTFOLD@
    33 ifeq ($(ENABLE_ACCENTFOLD), 1)
    34 UNAC=unac
    35 else
    36 UNAC=
    37 endif
    38 
    3932PACKAGEDIRS =   wv/wv-gs rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
    4033        wget/wget-1.9 expat/ cpan/XML-Parser-2.34 \
    41         $(UNAC) xlhtml/xlhtml-0.4.9.0 isis-gdl
     34        xlhtml/xlhtml-0.4.9.0 isis-gdl
    4235
    4336all:
  • trunk/gs2build-extra/packages.configure

    r13512 r13731  
    2121ENVIRONMENT=""
    2222
    23 # accentfolding enabled by default - switch it off with --disable-accentfold
    24 ENABLE_ACCENTFOLD=true
    25 
    2623# parse any arguments given from toplevel configure
    2724while test $# -ne 0; do
     
    4037        CACHE_FILE="--cache-file=$cache_file"
    4138        fi
    42         ;;
    43     --disable-accentfold)
    44         ENABLE_ACCENTFOLD=false
    4539        ;;
    4640    --prefix=*)
     
    177171./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS  $ENVIRONMENT
    178172
    179 # configure unac program
    180 echo ""
    181 echo "Configuring unac"
    182 echo ""
    183 if test x$ENABLE_ACCENTFOLD = xtrue ;   
    184 then
    185   echo "Accent folding support enabled, configuring unac library."
    186   echo "add --disable-accentfold to the configure command to disable this"
    187 
    188   cd "$PACKAGES/unac"
    189   ./configure $CACHE_FILE $HOSTTARGETFLAGS
    190 else
    191   echo "Accent folding support disabled."
    192   echo ""
    193 fi
Note: See TracChangeset for help on using the changeset viewer.