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

revert recent changes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@31362 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-09-16 14:08:16 +00:00
parent 6cc1db1712
commit 14275127c9
4 changed files with 22 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2010-09-16 Richard Frith-Macdonald <rfm@gnu.org>
* GNUstep.conf.in: revert recent changes.
* configure.ac: revert last changes and more.
* configure: Regenerated.
Reverted recent changes, largely to do with remembering filesystem
layout preferences. Nicola pointed out that remembering preferences
automatically might not be good, and suggested a different mechanism.
That means current code temporarily needs a --with-layout=gnustep for
the old behavior on most systems.
2010-09-16 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Remove extra line accidentally added in preious commit.

4
GNUstep.conf.in
View file

@ -51,10 +51,6 @@ GNUSTEP_USER_DEFAULTS_DIR=@GNUSTEP_USER_DEFAULTS_DIR@
# Traditionally, this is /usr/GNUstep/System/Library/Makefiles
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
# This is the filesystem layout specified when gnustep-make was configured.
# The value may be empty.
GNUSTEP_FILESYSTEM_LAYOUT_FILE=@GNUSTEP_FILESYSTEM_LAYOUT_FILE@
# This is where the user home directories are. Only used to provide
# NSUserDirectory in gnustep-base. Never used anywhere else.
GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@

27
configure vendored
View file

@ -687,7 +687,6 @@ GNUSTEP_USER_DEFAULTS_DIR
GNUSTEP_USER_CONFIG_FILE
GNUSTEP_CONFIG_FILE
GNUSTEP_ABSOLUTE_INSTALL_PATHS
GNUSTEP_FILESYSTEM_LAYOUT_FILE
GNUSTEP_MAKE_STRICT_V2_MODE
CHOWN
TAR
@ -4607,28 +4606,17 @@ fi
# The variable GNUSTEP_FILESYSTEM_LAYOUT is empty if no layout was
# specified on the command line. In that case, we read the config
# file (which might contain more up-to-date information on what layout
# the user wants). If the variable is non-empty, then we avoid
# reading the config file (the user already explicitly specified what
# layout they want, so we omit to read existing config that might mess
# that up).
# specified on the command line. In that case, we use any 'native'
# layout, but we leave GNUSTEP_FILESYSTEM_LAYOUT unset so that later
# tests can tell that no layout was specified.
if test ! x"$GNUSTEP_FILESYSTEM_LAYOUT" = x""; then
{ $as_echo "$as_me:$LINENO: result: $GNUSTEP_FILESYSTEM_LAYOUT" >&5
$as_echo "$GNUSTEP_FILESYSTEM_LAYOUT" >&6; }
GNUSTEP_FILESYSTEM_LAYOUT_FILE="$GNUSTEP_FILESYSTEM_LAYOUT"
else
# Find any layout for the currently installed copy of GNUstep (if any)
# and use that if possible, otherwise use 'native' layout.
GNUSTEP_PREVIOUS_LAYOUT=`gnustep-config --variable=GNUSTEP_FILESYSTEM_LAYOUT_FILE 2>/dev/null`
if test ! x"$GNUSTEP_PREVIOUS_LAYOUT" = x""; then
{ $as_echo "$as_me:$LINENO: result: $GNUSTEP_PREVIOUS_LAYOUT" >&5
$as_echo "$GNUSTEP_PREVIOUS_LAYOUT" >&6; }
GNUSTEP_FILESYSTEM_LAYOUT_FILE="$GNUSTEP_PREVIOUS_LAYOUT"
else
GNUSTEP_FILESYSTEM_LAYOUT_FILE=native
fi
{ $as_echo "$as_me:$LINENO: result: not specified... use 'native'" >&5
$as_echo "not specified... use 'native'" >&6; }
GNUSTEP_FILESYSTEM_LAYOUT_FILE=native
fi
if test x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"native"; then
@ -4645,7 +4633,6 @@ $as_echo "default layout: 'apple' since we're on apple-apple-apple" >&6; }
GNUSTEP_FILESYSTEM_LAYOUT_FILE=apple
else
case "$target_os" in
darwin*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=apple ;;
linux*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=fhs ;;
*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=gnustep ;;
esac
@ -4660,8 +4647,6 @@ if test ! -f "$srcdir/FilesystemLayouts/$GNUSTEP_FILESYSTEM_LAYOUT_FILE" >&5 2>&
exit 1
fi
# Need to do some checks related to building dylibs on darwin.
GNUSTEP_ABSOLUTE_INSTALL_PATHS=;

24
configure.ac
View file

@ -326,26 +326,15 @@ AC_ARG_WITH(layout,[
GNUSTEP_FILESYSTEM_LAYOUT="$withval",)
# The variable GNUSTEP_FILESYSTEM_LAYOUT is empty if no layout was
# specified on the command line. In that case, we read the config
# file (which might contain more up-to-date information on what layout
# the user wants). If the variable is non-empty, then we avoid
# reading the config file (the user already explicitly specified what
# layout they want, so we omit to read existing config that might mess
# that up).
# specified on the command line. In that case, we use any 'native'
# layout, but we leave GNUSTEP_FILESYSTEM_LAYOUT unset so that later
# tests can tell that no layout was specified.
if test ! x"$GNUSTEP_FILESYSTEM_LAYOUT" = x""; then
AC_MSG_RESULT($GNUSTEP_FILESYSTEM_LAYOUT)
GNUSTEP_FILESYSTEM_LAYOUT_FILE="$GNUSTEP_FILESYSTEM_LAYOUT"
else
# Find any layout for the currently installed copy of GNUstep (if any)
# and use that if possible, otherwise use 'native' layout.
GNUSTEP_PREVIOUS_LAYOUT=`gnustep-config --variable=GNUSTEP_FILESYSTEM_LAYOUT_FILE 2>/dev/null`
if test ! x"$GNUSTEP_PREVIOUS_LAYOUT" = x""; then
AC_MSG_RESULT($GNUSTEP_PREVIOUS_LAYOUT)
GNUSTEP_FILESYSTEM_LAYOUT_FILE="$GNUSTEP_PREVIOUS_LAYOUT"
else
GNUSTEP_FILESYSTEM_LAYOUT_FILE=native
fi
AC_MSG_RESULT(not specified... use 'native')
GNUSTEP_FILESYSTEM_LAYOUT_FILE=native
fi
if test x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"native"; then
@ -361,7 +350,6 @@ if test x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"native"; then
GNUSTEP_FILESYSTEM_LAYOUT_FILE=apple
else
case "$target_os" in
darwin*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=apple ;;
linux*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=fhs ;;
*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=gnustep ;;
esac
@ -375,8 +363,6 @@ if test ! -f "$srcdir/FilesystemLayouts/$GNUSTEP_FILESYSTEM_LAYOUT_FILE" >&5 2>&
exit 1
fi
AC_SUBST(GNUSTEP_FILESYSTEM_LAYOUT_FILE)
# Need to do some checks related to building dylibs on darwin.
GNUSTEP_ABSOLUTE_INSTALL_PATHS=;