mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Move HOST_INSTALL
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13055 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
0815aec7e1
commit
d91ef8a3e3
3 changed files with 34 additions and 29 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Sat Mar 9 09:52:51 2002 Adam Fedor <fedor@yogi.doc.com>
|
||||
|
||||
* configure.in: Move HOST_INSTALL so that prefix is defined before
|
||||
it is set.
|
||||
|
||||
Fri Mar 8 12:53:05 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Instance/palette.make ($(PALETTE_DIR_NAME)/Resources/palette.table): Fixed
|
||||
|
|
|
|||
38
configure
vendored
38
configure
vendored
|
|
@ -1456,18 +1456,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
|
|||
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
# 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/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1471: checking whether ln -s works" >&5
|
||||
echo "configure:1461: checking whether ln -s works" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1493,7 +1483,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1497: checking for $ac_word" >&5
|
||||
echo "configure:1487: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1533,7 +1523,7 @@ fi
|
|||
# Extract the first word of "chown", so it can be a program name with args.
|
||||
set dummy chown; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1537: checking for $ac_word" >&5
|
||||
echo "configure:1527: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CHOWN'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1575,7 +1565,7 @@ fi
|
|||
# Also test for the C: directory, which means we're on Windows
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking for GNUSTEP_SYSTEM_ROOT to use""... $ac_c" 1>&6
|
||||
echo "configure:1579: checking for GNUSTEP_SYSTEM_ROOT to use" >&5
|
||||
echo "configure:1569: checking for GNUSTEP_SYSTEM_ROOT to use" >&5
|
||||
|
||||
if test "x$prefix" = "xNONE"; then
|
||||
prefix="$ac_default_prefix" ;
|
||||
|
|
@ -1612,7 +1602,7 @@ echo "$ac_t""$prefix" 1>&6
|
|||
# --with-local-root and --with-network-root
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking for GNUSTEP_LOCAL_ROOT to use""... $ac_c" 1>&6
|
||||
echo "configure:1616: checking for GNUSTEP_LOCAL_ROOT to use" >&5
|
||||
echo "configure:1606: checking for GNUSTEP_LOCAL_ROOT to use" >&5
|
||||
# Check whether --with-local-root or --without-local-root was given.
|
||||
if test "${with_local_root+set}" = set; then
|
||||
withval="$with_local_root"
|
||||
|
|
@ -1625,7 +1615,7 @@ fi
|
|||
echo "$ac_t""$GNUSTEP_LOCAL_ROOT" 1>&6
|
||||
|
||||
echo $ac_n "checking for GNUSTEP_NETWORK_ROOT to use""... $ac_c" 1>&6
|
||||
echo "configure:1629: checking for GNUSTEP_NETWORK_ROOT to use" >&5
|
||||
echo "configure:1619: checking for GNUSTEP_NETWORK_ROOT to use" >&5
|
||||
# Check whether --with-network-root or --without-network-root was given.
|
||||
if test "${with_network_root+set}" = set; then
|
||||
withval="$with_network_root"
|
||||
|
|
@ -1638,7 +1628,7 @@ fi
|
|||
echo "$ac_t""$GNUSTEP_NETWORK_ROOT" 1>&6
|
||||
|
||||
echo $ac_n "checking for GNUSTEP_USER_ROOT to be forced for all users""... $ac_c" 1>&6
|
||||
echo "configure:1642: checking for GNUSTEP_USER_ROOT to be forced for all users" >&5
|
||||
echo "configure:1632: checking for GNUSTEP_USER_ROOT to be forced for all users" >&5
|
||||
# Check whether --with-user-root or --without-user-root was given.
|
||||
if test "${with_user_root+set}" = set; then
|
||||
withval="$with_user_root"
|
||||
|
|
@ -1652,7 +1642,7 @@ echo "$ac_t""$FORCE_USER_ROOT" 1>&6
|
|||
|
||||
|
||||
echo $ac_n "checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users""... $ac_c" 1>&6
|
||||
echo "configure:1656: checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users" >&5
|
||||
echo "configure:1646: checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users" >&5
|
||||
# Check whether --with-defaults-root or --without-defaults-root was given.
|
||||
if test "${with_defaults_root+set}" = set; then
|
||||
withval="$with_defaults_root"
|
||||
|
|
@ -1668,6 +1658,16 @@ echo "$ac_t""$FORCE_DEFAULTS_ROOT" 1>&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/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
#--------------------------------------------------------------------
|
||||
# Is the system flattened?
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -2432,7 +2432,6 @@ s%@DLLTOOL@%$DLLTOOL%g
|
|||
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
||||
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
||||
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
||||
s%@HOST_INSTALL@%$HOST_INSTALL%g
|
||||
s%@LN_S@%$LN_S%g
|
||||
s%@TAR@%$TAR%g
|
||||
s%@CHOWN@%$CHOWN%g
|
||||
|
|
@ -2442,6 +2441,7 @@ s%@FORCE_USER_ROOT@%$FORCE_USER_ROOT%g
|
|||
s%@FORCE_DEFAULTS_ROOT@%$FORCE_DEFAULTS_ROOT%g
|
||||
s%@GNUSTEP_LOCAL_ROOT@%$GNUSTEP_LOCAL_ROOT%g
|
||||
s%@GNUSTEP_NETWORK_ROOT@%$GNUSTEP_NETWORK_ROOT%g
|
||||
s%@HOST_INSTALL@%$HOST_INSTALL%g
|
||||
s%@GNUSTEP_FLATTENED@%$GNUSTEP_FLATTENED%g
|
||||
s%@BACKEND_BUNDLE@%$BACKEND_BUNDLE%g
|
||||
s%@FORCE_CPPFLAGS@%$FORCE_CPPFLAGS%g
|
||||
|
|
|
|||
20
configure.in
20
configure.in
|
|
@ -99,16 +99,6 @@ else
|
|||
fi
|
||||
|
||||
AC_PROG_INSTALL
|
||||
# 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/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
AC_LN_S
|
||||
|
||||
AC_CHECK_PROGS(TAR, gnutar gtar, tar)
|
||||
|
|
@ -167,6 +157,16 @@ AC_SUBST(GNUSTEP_ROOT)
|
|||
AC_SUBST(root_prefix)
|
||||
AC_MSG_RESULT($prefix)
|
||||
|
||||
# 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/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-defaults-root, --with-user-root,
|
||||
# --with-local-root and --with-network-root
|
||||
|
|
|
|||
Loading…
Reference in a new issue