gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed obsolete variable GNUSTEP_ROOT

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21810 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-10-12 21:11:28 +00:00
parent e9942b16d3
commit 1ec2cfa824
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
Removed obsolete variable GNUSTEP_ROOT.
* configure.ac: Do not replace GNUSTEP_ROOT in generate files.
* configure: Regenerated.
* GNUstep.csh.in: Do not define GNUSTEP_ROOT.
* GNUstep.sh.in: Do not define GNUSTEP_ROOT.
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
* configure.ac: Define GNUSTEP_SYSTEM_ROOT from prefix. Export

1
GNUstep.csh.in
View file

@ -28,7 +28,6 @@
# Set the GNUstep system root and local root
#
## FIXME - those should be taken from GNUstep.conf
setenv GNUSTEP_ROOT "@GNUSTEP_ROOT@"
setenv GNUSTEP_SYSTEM_ROOT "@GNUSTEP_SYSTEM_ROOT@"
setenv GNUSTEP_FLATTENED "@GNUSTEP_FLATTENED@"
if ( ! ${?LIBRARY_COMBO} ) then

3
GNUstep.sh.in
View file

@ -76,13 +76,12 @@ fi
# FIXME - Paths should not be hardcoded in here. We need to include GNUstep.conf
# instead where the paths are configured!
#
GNUSTEP_ROOT=@GNUSTEP_ROOT@
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
if [ -z "$LIBRARY_COMBO" ]; then
LIBRARY_COMBO=@ac_cv_library_combo@
fi
export GNUSTEP_ROOT GNUSTEP_SYSTEM_ROOT GNUSTEP_FLATTENED LIBRARY_COMBO
export GNUSTEP_SYSTEM_ROOT GNUSTEP_FLATTENED LIBRARY_COMBO
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
export GNUSTEP_MAKEFILES

7
configure vendored
View file

@ -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 GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_ROOT GNUSTEP_MAKEFILES HOST_INSTALL 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_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_ROOT GNUSTEP_MAKEFILES HOST_INSTALL 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.
@ -3234,6 +3234,9 @@ echo $ECHO_N "checking for GNUSTEP_SYSTEM_ROOT to use... $ECHO_C" >&6
if test "x$prefix" = "xNONE"; then
prefix="$ac_default_prefix" ;
fi
#
# GNUSTEP_ROOT is only used to build GNUSTEP_LOCAL_ROOT if not specified
#
GNUSTEP_ROOT="$prefix"
if test "x`basename $prefix`" = xSystem; then
GNUSTEP_ROOT=`dirname $prefix`
@ -3245,7 +3248,6 @@ else
fi
fi
#--------------------------------------------------------------------
# Process --with-system-root (TODO)
#--------------------------------------------------------------------
@ -5661,7 +5663,6 @@ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
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,@GNUSTEP_SYSTEM_ROOT@,$GNUSTEP_SYSTEM_ROOT,;t t
s,@GNUSTEP_LOCAL_ROOT@,$GNUSTEP_LOCAL_ROOT,;t t
s,@GNUSTEP_NETWORK_ROOT@,$GNUSTEP_NETWORK_ROOT,;t t

5
configure.ac
View file

@ -197,6 +197,10 @@ fi`)
if test "x$prefix" = "xNONE"; then
prefix="$ac_default_prefix" ;
fi
#
# GNUSTEP_ROOT is only used to build GNUSTEP_LOCAL_ROOT if no
# --with-local-root= option is used.
#
GNUSTEP_ROOT="$prefix"
if test "x`basename $prefix`" = xSystem; then
GNUSTEP_ROOT=`dirname $prefix`
@ -207,7 +211,6 @@ else
prefix="$prefix/System"
fi
fi
AC_SUBST(GNUSTEP_ROOT)
#--------------------------------------------------------------------
# Process --with-system-root (TODO)