mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Use GNUSTEP_SYSTEM_ROOT in configure stages instead of prefix
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21809 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
f1b925a0fb
commit
e9942b16d3
7 changed files with 127 additions and 56 deletions
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: Define GNUSTEP_SYSTEM_ROOT from prefix. Export
|
||||
and reference it instead of exporting and referencing 'prefix' to
|
||||
clarify what is happening. Reordered some configure stages to
|
||||
prepare it for further changes.
|
||||
* configure: Regenerated.
|
||||
* GNUmakefile.in: Use GNUSTEP_SYSTEM_ROOT instead of prefix.
|
||||
* GNUstep.csh.in: Same change.
|
||||
* GNUstep.sh.in: Same change.
|
||||
* GNUstep.conf.in: Same change.
|
||||
|
||||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac (MAKEFILE_SUFFIX): Variable removed.
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ special_prefix =
|
|||
|
||||
GNUSTEP_CONFIG_FILE = $(special_prefix)@gnustep_config_file@
|
||||
GNUSTEP_CONFIG_FILE_DIR = $(dir $(GNUSTEP_CONFIG_FILE))
|
||||
GNUSTEP_SYSTEM_ROOT = $(special_prefix)@prefix@
|
||||
GNUSTEP_SYSTEM_ROOT = $(special_prefix)@GNUSTEP_SYSTEM_ROOT@
|
||||
GNUSTEP_LOCAL_ROOT = $(special_prefix)@GNUSTEP_LOCAL_ROOT@
|
||||
GNUSTEP_NETWORK_ROOT = $(special_prefix)@GNUSTEP_NETWORK_ROOT@
|
||||
srcdir = @srcdir@
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
## include this file in shell scripts and makefiles, and sh syntax
|
||||
## requires no spaces around the '=').
|
||||
|
||||
GNUSTEP_SYSTEM_ROOT=@prefix@
|
||||
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
|
||||
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
|
||||
GNUSTEP_NETWORK_ROOT=@GNUSTEP_NETWORK_ROOT@
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#
|
||||
## FIXME - those should be taken from GNUstep.conf
|
||||
setenv GNUSTEP_ROOT "@GNUSTEP_ROOT@"
|
||||
setenv GNUSTEP_SYSTEM_ROOT "@prefix@"
|
||||
setenv GNUSTEP_SYSTEM_ROOT "@GNUSTEP_SYSTEM_ROOT@"
|
||||
setenv GNUSTEP_FLATTENED "@GNUSTEP_FLATTENED@"
|
||||
if ( ! ${?LIBRARY_COMBO} ) then
|
||||
setenv LIBRARY_COMBO "@ac_cv_library_combo@"
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ fi
|
|||
# instead where the paths are configured!
|
||||
#
|
||||
GNUSTEP_ROOT=@GNUSTEP_ROOT@
|
||||
GNUSTEP_SYSTEM_ROOT=@prefix@
|
||||
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
|
||||
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
|
||||
if [ -z "$LIBRARY_COMBO" ]; then
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
|
|
|
|||
88
configure
vendored
88
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 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_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_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3206,6 +3206,22 @@ fi
|
|||
# GNUstep specific options follow
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --prefix
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# In practice,
|
||||
#
|
||||
# ./configure --prefix=/usr/GNUstep
|
||||
#
|
||||
# is equivalent to:
|
||||
#
|
||||
# ./configure --with-system-root=/usr/GNUstep/System
|
||||
# --with-local-root=/usr/GNUstep/Local
|
||||
#
|
||||
# (TODO finish corner details)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# The GNUstep root directory.
|
||||
# The user should have the GNUSTEP_SYSTEM_ROOT environment variable
|
||||
|
|
@ -3229,28 +3245,17 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: result: $prefix" >&5
|
||||
echo "${ECHO_T}$prefix" >&6
|
||||
|
||||
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="$GNUSTEP_MAKEFILES/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-system-root (TODO), --with-local-root and --with-network-root
|
||||
# Process --with-system-root (TODO)
|
||||
#--------------------------------------------------------------------
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix
|
||||
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_ROOT" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_ROOT" >&6
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --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
|
||||
|
|
@ -3309,6 +3314,30 @@ echo "$as_me:$LINENO: result: $GNUSTEP_USER_ROOT" >&5
|
|||
echo "${ECHO_T}$GNUSTEP_USER_ROOT" >&6
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setting up GNUSTEP_MAKEFILES
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_MAKEFILES to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_MAKEFILES to use... $ECHO_C" >&6
|
||||
GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles
|
||||
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_MAKEFILES" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_MAKEFILES" >&6
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setting up the install-sh script
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# 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="$GNUSTEP_MAKEFILES/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Is the system flattened?
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -3404,14 +3433,14 @@ CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
|
|||
|
||||
# Set location of GNUstep dirs for later use
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -3443,9 +3472,9 @@ echo "${ECHO_T}$gs_cv_objc_libdir" >&6
|
|||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers"
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
|
@ -5633,11 +5662,12 @@ 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_MAKEFILES@,$GNUSTEP_MAKEFILES,;t t
|
||||
s,@HOST_INSTALL@,$HOST_INSTALL,;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
|
||||
s,@GNUSTEP_USER_ROOT@,$GNUSTEP_USER_ROOT,;t t
|
||||
s,@GNUSTEP_MAKEFILES@,$GNUSTEP_MAKEFILES,;t t
|
||||
s,@HOST_INSTALL@,$HOST_INSTALL,;t t
|
||||
s,@GNUSTEP_FLATTENED@,$GNUSTEP_FLATTENED,;t t
|
||||
s,@GNUSTEP_MULTI_PLATFORM@,$GNUSTEP_MULTI_PLATFORM,;t t
|
||||
s,@BACKEND_BUNDLE@,$BACKEND_BUNDLE,;t t
|
||||
|
|
|
|||
75
configure.ac
75
configure.ac
|
|
@ -162,6 +162,22 @@ fi
|
|||
# GNUstep specific options follow
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --prefix
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# In practice,
|
||||
#
|
||||
# ./configure --prefix=/usr/GNUstep
|
||||
#
|
||||
# is equivalent to:
|
||||
#
|
||||
# ./configure --with-system-root=/usr/GNUstep/System
|
||||
# --with-local-root=/usr/GNUstep/Local
|
||||
#
|
||||
# (TODO finish corner details)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# The GNUstep root directory.
|
||||
# The user should have the GNUSTEP_SYSTEM_ROOT environment variable
|
||||
|
|
@ -192,25 +208,16 @@ else
|
|||
fi
|
||||
fi
|
||||
AC_SUBST(GNUSTEP_ROOT)
|
||||
AC_MSG_RESULT($prefix)
|
||||
|
||||
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="$GNUSTEP_MAKEFILES/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-system-root (TODO), --with-local-root and --with-network-root
|
||||
# Process --with-system-root (TODO)
|
||||
#--------------------------------------------------------------------
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ROOT)
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_ROOT)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-local-root and --with-network-root
|
||||
#--------------------------------------------------------------------
|
||||
AC_MSG_CHECKING(for GNUSTEP_LOCAL_ROOT to use)
|
||||
AC_ARG_WITH(local-root,
|
||||
|
|
@ -265,6 +272,28 @@ GNUSTEP_USER_ROOT="~/GNUstep"
|
|||
AC_MSG_RESULT($GNUSTEP_USER_ROOT)
|
||||
AC_SUBST(GNUSTEP_USER_ROOT)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setting up GNUSTEP_MAKEFILES
|
||||
#--------------------------------------------------------------------
|
||||
AC_MSG_CHECKING(for GNUSTEP_MAKEFILES to use)
|
||||
GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles
|
||||
AC_SUBST(GNUSTEP_MAKEFILES)
|
||||
AC_MSG_RESULT($GNUSTEP_MAKEFILES)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setting up the install-sh script
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# 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="$GNUSTEP_MAKEFILES/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Is the system flattened?
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -348,14 +377,14 @@ CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
|
|||
|
||||
# Set location of GNUstep dirs for later use
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -382,9 +411,9 @@ AC_MSG_RESULT($gs_cv_objc_libdir)
|
|||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers"
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue