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

bugfix, improved comments, and set native layout for darwin to be apple.

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

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-09-16 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Remove extra line accidentally added in preious commit.
Improve comments on filesystem layout. Make 'apple' the native layout
on the darwin operating system.
* configure: Regenerated.
2010-09-10 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Use fhs as the default layout on gnu/linux systems.

9
configure vendored
View file

@ -4619,6 +4619,8 @@ if test ! x"$GNUSTEP_FILESYSTEM_LAYOUT" = x""; then
$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
@ -4634,20 +4636,21 @@ if test x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"native"; then
# GNUstep with no other indication. We normally use the native
# layout for the target operating system (if we know it) or 'gnustep'
# if we don't.
# However, if the library-combo is apple-apple-apple we use 'apple'.
#
# However, for backward compatibility, if the library-combo is
# apple-apple-apple we use 'apple' irrespective of the target OS
# though I'm not sure that really makes sense.
if test "$ac_cv_library_combo" = "apple-apple-apple"; then
{ $as_echo "$as_me:$LINENO: result: default layout: 'apple' since we're on apple-apple-apple" >&5
$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
{ $as_echo "$as_me:$LINENO: result: default layout: '$GNUSTEP_FILESYSTEM_LAYOUT_FILE'" >&5
$as_echo "default layout: '$GNUSTEP_FILESYSTEM_LAYOUT_FILE'" >&6; }
GNUSTEP_FILESYSTEM_LAYOUT_FILE=gnustep
fi
fi

9
configure.ac
View file

@ -337,6 +337,8 @@ 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)
@ -351,18 +353,19 @@ if test x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"native"; then
# GNUstep with no other indication. We normally use the native
# layout for the target operating system (if we know it) or 'gnustep'
# if we don't.
# However, if the library-combo is apple-apple-apple we use 'apple'.
#
# However, for backward compatibility, if the library-combo is
# apple-apple-apple we use 'apple' irrespective of the target OS
# though I'm not sure that really makes sense.
if test "$ac_cv_library_combo" = "apple-apple-apple"; then
AC_MSG_RESULT(default layout: 'apple' since we're on apple-apple-apple)
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
AC_MSG_RESULT(default layout: '$GNUSTEP_FILESYSTEM_LAYOUT_FILE')
GNUSTEP_FILESYSTEM_LAYOUT_FILE=gnustep
fi
fi