mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Use GNUSTEP_MAKEFILES, not MAKEFILES_SUFFIX
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21808 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
33b097fcf7
commit
f1b925a0fb
10 changed files with 86 additions and 52 deletions
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac (MAKEFILE_SUFFIX): Variable removed.
|
||||
(GNUSTEP_MAKEFILES): New variable (that is more standard and more
|
||||
suited to make it a configure option in the future). Replace it
|
||||
in generated files.
|
||||
* configure: Regenerated.
|
||||
* debugapp.in: Use everywhere GNUSTEP_MAKEFILES, not
|
||||
MAKEFILE_SUFFIX.
|
||||
* opentool.in: Same change.
|
||||
* GNUmakefile.in: Same change.
|
||||
* executable.template.in: Same change.
|
||||
* GNUstep.sh.in: Same change.
|
||||
* GNUstep.csh.in: Same change.
|
||||
* gnustep-make.spec.in: Removed MAKEFILE_SUFFIX, use Library/Makefiles
|
||||
directly.
|
||||
|
||||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: Removed obsolete --without-system-root option.
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ export GNUSTEP_TARGET_DIR
|
|||
export GNUSTEP_TARGET_LDIR
|
||||
export MAYBE_LIBRARY_COMBO
|
||||
|
||||
makedir = $(GNUSTEP_SYSTEM_ROOT)/@MAKEFILES_SUFFIX@
|
||||
makedir = @GNUSTEP_MAKEFILES@
|
||||
tooldir = $(GNUSTEP_SYSTEM_ROOT)/Tools
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ endif
|
|||
setenv GNUSTEP_LOCAL_ROOT "@GNUSTEP_LOCAL_ROOT@"
|
||||
setenv GNUSTEP_NETWORK_ROOT "@GNUSTEP_NETWORK_ROOT@"
|
||||
|
||||
setenv GNUSTEP_MAKEFILES "${GNUSTEP_SYSTEM_ROOT}/@MAKEFILES_SUFFIX@"
|
||||
setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@"
|
||||
|
||||
if ( "@GNUSTEP_MULTI_PLATFORM@" == "" ) then
|
||||
setenv GNUSTEP_HOST "@target@"
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ if [ -z "$LIBRARY_COMBO" ]; then
|
|||
fi
|
||||
export GNUSTEP_ROOT GNUSTEP_SYSTEM_ROOT GNUSTEP_FLATTENED LIBRARY_COMBO
|
||||
|
||||
GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@
|
||||
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
|
||||
export GNUSTEP_MAKEFILES
|
||||
|
||||
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
|
||||
|
|
|
|||
22
configure
vendored
22
configure
vendored
|
|
@ -318,7 +318,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES gnustep_config_file GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES gnustep_config_file GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3232,26 +3232,25 @@ fi
|
|||
echo "$as_me:$LINENO: result: $prefix" >&5
|
||||
echo "${ECHO_T}$prefix" >&6
|
||||
|
||||
# Makefiles directory location is in a bit of flux now. To keep the
|
||||
# Makefiles dir in the previous location, reset this variable to
|
||||
# 'Makefiles' and regenerate configure. Note this doesn't change all
|
||||
# occurances.
|
||||
MAKEFILES_SUFFIX=Library/Makefiles
|
||||
echo "$as_me:$LINENO: checking for makefile location to use" >&5
|
||||
echo $ECHO_N "checking for makefile location to use... $ECHO_C" >&6
|
||||
GNUSTEP_MAKEFILES=$prefix/Library/Makefiles
|
||||
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_MAKEFILES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_MAKEFILES" >&6
|
||||
|
||||
# HOST_INSTALL is the name of the install program in config.make so set it up
|
||||
# to point to the install-sh script in the GNUstep tree if no system install is
|
||||
# found.
|
||||
|
||||
if test "$INSTALL" = "$ac_install_sh"; then
|
||||
HOST_INSTALL="$prefix/$MAKEFILES_SUFFIX/$INSTALL"
|
||||
HOST_INSTALL="$GNUSTEP_MAKEFILES/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-defaults-root, --with-user-root,
|
||||
# --with-local-root and --with-network-root
|
||||
# Process --with-system-root (TODO), --with-local-root and --with-network-root
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_LOCAL_ROOT to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_LOCAL_ROOT to use... $ECHO_C" >&6
|
||||
|
|
@ -3291,6 +3290,9 @@ echo "${ECHO_T}$GNUSTEP_NETWORK_ROOT" >&6
|
|||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-defaults-root and --with-user-root
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_USER_ROOT to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_USER_ROOT to use... $ECHO_C" >&6
|
||||
|
||||
|
|
@ -5631,7 +5633,7 @@ s,@LN_S@,$LN_S,;t t
|
|||
s,@TAR@,$TAR,;t t
|
||||
s,@CHOWN@,$CHOWN,;t t
|
||||
s,@GNUSTEP_ROOT@,$GNUSTEP_ROOT,;t t
|
||||
s,@MAKEFILES_SUFFIX@,$MAKEFILES_SUFFIX,;t t
|
||||
s,@GNUSTEP_MAKEFILES@,$GNUSTEP_MAKEFILES,;t t
|
||||
s,@HOST_INSTALL@,$HOST_INSTALL,;t t
|
||||
s,@GNUSTEP_LOCAL_ROOT@,$GNUSTEP_LOCAL_ROOT,;t t
|
||||
s,@GNUSTEP_NETWORK_ROOT@,$GNUSTEP_NETWORK_ROOT,;t t
|
||||
|
|
|
|||
12
configure.ac
12
configure.ac
|
|
@ -194,19 +194,17 @@ fi
|
|||
AC_SUBST(GNUSTEP_ROOT)
|
||||
AC_MSG_RESULT($prefix)
|
||||
|
||||
# Makefiles directory location is in a bit of flux now. To keep the
|
||||
# Makefiles dir in the previous location, reset this variable to
|
||||
# 'Makefiles' and regenerate configure. Note this doesn't change all
|
||||
# occurances.
|
||||
MAKEFILES_SUFFIX=Library/Makefiles
|
||||
AC_SUBST(MAKEFILES_SUFFIX)
|
||||
AC_MSG_CHECKING(for makefile location to use)
|
||||
GNUSTEP_MAKEFILES=$prefix/Library/Makefiles
|
||||
AC_SUBST(GNUSTEP_MAKEFILES)
|
||||
AC_MSG_RESULT($GNUSTEP_MAKEFILES)
|
||||
|
||||
# HOST_INSTALL is the name of the install program in config.make so set it up
|
||||
# to point to the install-sh script in the GNUstep tree if no system install is
|
||||
# found.
|
||||
AC_SUBST(HOST_INSTALL)
|
||||
if test "$INSTALL" = "$ac_install_sh"; then
|
||||
HOST_INSTALL="$prefix/$MAKEFILES_SUFFIX/$INSTALL"
|
||||
HOST_INSTALL="$GNUSTEP_MAKEFILES/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
|
|
|||
22
debugapp.in
22
debugapp.in
|
|
@ -141,28 +141,32 @@ if [ -z "$full_appname" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_MAKEFILES" ]; then
|
||||
GNUSTEP_MAKEFILES = $GNUSTEP_SYSTEM_ROOT/Library/Makefiles
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.guess`
|
||||
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.sub $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.guess`
|
||||
GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.sub $GNUSTEP_HOST`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_MAKEFILES/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_MAKEFILES/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
|
|
@ -180,7 +184,7 @@ fi
|
|||
appname="`echo \"$app\" | sed 's/\.[a-z]*$//'`"
|
||||
appname="`basename \"$appname\"`"
|
||||
appname="$appname$EXEEXT"
|
||||
. "$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/ld_lib_path.sh"
|
||||
. "$GNUSTEP_MAKEFILES/ld_lib_path.sh"
|
||||
|
||||
|
||||
if [ "$LIBRARY_COMBO" = "apple-apple-apple" ]; then
|
||||
|
|
|
|||
|
|
@ -59,10 +59,13 @@ do
|
|||
exit 0
|
||||
;;
|
||||
--library-combo=*)
|
||||
tmp_root="$GNUSTEP_SYSTEM_ROOT"
|
||||
. "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep-reset.sh"
|
||||
LIBRARY_COMBO=`echo "$1" | sed 's/--library-combo=//'`
|
||||
. "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep.sh"
|
||||
tmp_makefiles="$GNUSTEP_MAKEFILES"
|
||||
if [ -z "$tmp_makefiles" ]; then
|
||||
tmp_makefiles="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
|
||||
fi
|
||||
. "$tmp_makefiles/GNUstep-reset.sh"
|
||||
LIBRARY_COMBO=`echo "$1" | sed 's/--library-combo=//'`
|
||||
. "$tmp_makefiles/GNUstep.sh"
|
||||
shift
|
||||
;;
|
||||
--available-platforms)
|
||||
|
|
@ -162,24 +165,28 @@ fi
|
|||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_MAKEFILES" ]; then
|
||||
GNUSTEP_MAKEFILES = $GNUSTEP_SYSTEM_ROOT/Library/Makefiles
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.guess)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.sub $GNUSTEP_HOST)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.guess)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.sub $GNUSTEP_HOST)`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_MAKEFILES/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_MAKEFILES/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
|
|
@ -204,10 +211,13 @@ else
|
|||
if [ "$lib_combo" != '*' ]; then
|
||||
if [ -x "$lib_combo/$appname" ]; then
|
||||
# Switch LIBRARY_COMBO on the fly
|
||||
tmp_root="$GNUSTEP_SYSTEM_ROOT"
|
||||
. "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep-reset.sh"
|
||||
tmp_makefiles="$GNUSTEP_MAKEFILES"
|
||||
if [ -z "$tmp_makefiles" ]; then
|
||||
tmp_makefiles="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
|
||||
fi
|
||||
. "$tmp_makefiles/GNUstep-reset.sh"
|
||||
LIBRARY_COMBO="$lib_combo"
|
||||
. "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep.sh"
|
||||
. "$tmp_makefiles/GNUstep.sh"
|
||||
# Use the found executable
|
||||
relative_path="$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname"
|
||||
found=yes
|
||||
|
|
@ -243,7 +253,7 @@ else
|
|||
fi
|
||||
|
||||
# Load up LD_LIBRARY_PATH
|
||||
. "$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/ld_lib_path.sh"
|
||||
. "$GNUSTEP_MAKEFILES/ld_lib_path.sh"
|
||||
|
||||
exec "$full_appname/$relative_path" "$@"
|
||||
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
|
|||
# Create profile files
|
||||
|
||||
echo "#!/bin/sh" > mygnustep.sh
|
||||
echo ". %{gs_prefix}/System/@MAKEFILES_SUFFIX@/GNUstep.sh" >> mygnustep.sh
|
||||
echo ". %{gs_prefix}/System/Library/Makefiles/GNUstep.sh" >> mygnustep.sh
|
||||
|
||||
#echo "#!/bin/csh" > mygnustep.csh
|
||||
#echo "source %{gs_prefix}/System/@MAKEFILES_SUFFIX@/GNUstep.csh" >> mygnustep.csh
|
||||
#echo "source %{gs_prefix}/System/Library/Makefiles/GNUstep.csh" >> mygnustep.csh
|
||||
|
||||
chmod 755 mygnustep.*
|
||||
mv mygnustep.sh $RPM_BUILD_ROOT/etc/profile.d/GNUstep.sh
|
||||
|
|
@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
#if [ $1 = 1]; then
|
||||
#%ifos Linux
|
||||
# if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
|
||||
# . %{gs_root}/@MAKEFILES_SUFFIX@/GNUstep.sh
|
||||
# . %{gs_root}/Library/Makefiles/GNUstep.sh
|
||||
# fi
|
||||
# grep -q '%{gs_prefix}/System/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}' /etc/ld.so.conf || echo "%{gs_prefix}/System/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}" >> /etc/ld.so.conf
|
||||
#%endif
|
||||
|
|
@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
#if [ $1 = 0 ]; then
|
||||
#%ifos Linux
|
||||
# if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
|
||||
# . %{gs_root}/@MAKEFILES_SUFFIX@/GNUstep.sh
|
||||
# . %{gs_root}/Library/Makefiles/GNUstep.sh
|
||||
# fi
|
||||
# mv -f /etc/ld.so.conf /etc/ld.so.conf.orig
|
||||
# grep -v "^%{gs_prefix}/System/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}" /etc/ld.so.conf.orig > /etc/ld.so.conf
|
||||
|
|
|
|||
|
|
@ -46,10 +46,13 @@ while true
|
|||
do
|
||||
case "$1" in
|
||||
--library-combo=*)
|
||||
tmp_root="$GNUSTEP_SYSTEM_ROOT"
|
||||
. "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep-reset.sh"
|
||||
tmp_makefiles="$GNUSTEP_MAKEFILES"
|
||||
if [ -z "$tmp_makefiles" ]; then
|
||||
tmp_makefiles="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
|
||||
fi
|
||||
. "$tmp_makefiles/GNUstep-reset.sh"
|
||||
LIBRARY_COMBO=`echo "$1" | sed 's/--library-combo=//'`
|
||||
. "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep.sh"
|
||||
. "$tmp_makefiles/GNUstep.sh"
|
||||
echo "Switched to library combo $LIBRARY_COMBO"
|
||||
shift
|
||||
;;
|
||||
|
|
|
|||
Loading…
Reference in a new issue