Ignore:
Timestamp:
2011-12-14T19:20:29+13:00 (12 years ago)
Author:
ak19
Message:

GSDLARCH used in Linux makefiles when working out the cgi-bin path (now cgi-bin\GSDL_OS_ARCH) to install the binaries into.

Location:
main/trunk/greenstone2/common-src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/Makefile.in

    r24874 r24901  
    3838
    3939GSDLOS = @gsdlos@
     40GSDLARCH = @gsdlarch@
    4041
    4142COMPILE = $(CC) -c

  • main/trunk/greenstone2/common-src/cgi-bin/Makefile.in

    r24879 r24901  
    2727COMMON_DIR = $(GSDL_DIR)/common-src
    2828GSDLOS = @gsdlos@
     29GSDLARCH = @gsdlarch@
    2930
    3031
    3132
    3233all:   
    33     mkdir -p $(GSDL_DIR)/cgi-bin/$(GSDLOS)
     34    mkdir -p $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)
    3435
    3536install:
    36     cp * $(GSDL_DIR)/cgi-bin/$(GSDLOS)/.
    37     rm -f $(GSDL_DIR)/cgi-bin/$(GSDLOS)/Makefile
    38     rm -f $(GSDL_DIR)/cgi-bin/$(GSDLOS)/Makefile.in
    39     rm -f $(GSDL_DIR)/cgi-bin/$(GSDLOS)/win32.mak
     37    cp * $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)/.
     38    rm -f $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)/Makefile
     39    rm -f $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)/Makefile.in
     40    rm -f $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)/win32.mak
    4041
    4142clean:
    42     rm -rf $(GSDL_DIR)/cgi-bin/$(GSDLOS)
     43    rm -rf $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)
    4344
    4445distclean:
    45     rm -rf $(GSDL_DIR)/cgi-bin/$(GSDLOS)
     46    rm -rf $(GSDL_DIR)/cgi-bin/$(GSDLOS)$(GSDLARCH)
    4647    rm -f Makefile
    4748

  • main/trunk/greenstone2/common-src/configure

    r24874 r24901  
    312312ac_subdirs_all="$ac_subdirs_all packages"
    313313ac_subdirs_all="$ac_subdirs_all indexers"
    314 ac_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 USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_JAVA USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX JAVA uudecode JAVAC JAVACFLAGS 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 COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
     314ac_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 USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_JAVA USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX JAVA uudecode JAVAC JAVACFLAGS 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 COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos gsdlarch MODULEDIRS subdirs LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    37803780  if test -z "$COMPAT32BITFLAGS" ; then
    37813781    COMPAT32BITFLAGS="-m32"
     3782    gsdlarch='64'
    37823783  fi
    37833784else
    … …  
    37863787  if test -z "$COMPAT32BITFLAGS" ; then
    37873788    COMPAT32BITFLAGS=
     3789    gsdlarch='32'
    37883790  fi
    37893791fi
    … …  
    75667568  gsdlos=windows
    75677569 fi
     7570
     7571
     7572# Make gsdlarch empty if the OS bit value (32 or 64) is not used in naming
     7573# directories already or if common-src is compiled up on its own.
     7574# E.g. 32/64 bit won't be used in the SVN version if only bin/linux exists.
     7575if test -d "../bin/$gsdlos" -o ! -f "../setup.bash" ; then
     7576   gsdlarch=""
     7577fi
    75687578
    75697579
    … …  
    85428552s,@STATIC@,$STATIC,;t t
    85438553s,@gsdlos@,$gsdlos,;t t
     8554s,@gsdlarch@,$gsdlarch,;t t
    85448555s,@MODULEDIRS@,$MODULEDIRS,;t t
    85458556s,@subdirs@,$subdirs,;t t

  • main/trunk/greenstone2/common-src/configure.in

    r24874 r24901  
    226226  if test -z "$COMPAT32BITFLAGS" ; then
    227227    COMPAT32BITFLAGS="-m32"
     228    gsdlarch='64'
    228229  fi
    229230else
    … …  
    231232  if test -z "$COMPAT32BITFLAGS" ; then
    232233    COMPAT32BITFLAGS=
     234    gsdlarch='32'
    233235  fi
    234236fi
    … …  
    426428 fi
    427429AC_SUBST(gsdlos)
     430
     431# Make gsdlarch empty if the OS bit value (32 or 64) is not used in naming
     432# directories already or if common-src is compiled up on its own.
     433# E.g. 32/64 bit won't be used in the SVN version if only bin/linux exists.
     434if test -d "../bin/$gsdlos" -o ! -f "../setup.bash" ; then
     435   gsdlarch=""
     436fi
     437AC_SUBST(gsdlarch)
    428438
    429439# check for endianness
Note: See TracChangeset for help on using the changeset viewer.