gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Another mingw fixup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24739 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-03-01 15:31:46 +00:00
parent fa43003aa1
commit a62325a01f
3 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-02-29 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Restorelast reversion and fix actual bug (I hope)
which was an incorrect setting of GNUSTEP_SYSTEM_TOOLS to the
Admin subdirectory, causing relative path calculations to be wrong.
* configure: regenerated.
2007-02-29 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m:

16
configure vendored
View file

@ -2164,14 +2164,12 @@ fi
GNUSTEP_DEFAULT_CONFIG="$result"
fi
if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then
# On platforms other than mingw we can fall back to GNUSTEP_CONFIG_FILE
# which (if undefined) will already have been set to the value of
# GNUSTEP_MAKE_CONFIG.
# On mingw we must never use GNUSTEP_MAKE_CONFIG ... as the paths from
# the make package are for building and are guaranteed to be wrong for
# use at runtime. We set $GNUSTEP_CONFIG_FILE to ./GNUstep.conf
# earlier to handle that case.
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE"
# We fall back to useing the make settings for the built-in ones.
# However, on mingw these will be msys style paths, and we don't
# want that ... so later on we convert these to portable relative
# paths based on the directory in which the base library will be
# installed.
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_MAKE_FILE"
fi
{ echo "$as_me:$LINENO: result: $GNUSTEP_DEFAULT_CONFIG" >&5
echo "${ECHO_T}$GNUSTEP_DEFAULT_CONFIG" >&6; }
@ -2212,7 +2210,7 @@ if test x"$GNUSTEP_MAKEFILES" = x""; then GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps; fi
if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps/Admin; fi
if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools; fi
if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi
if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_ADMIN_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi
if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_SYSTEM_ROOT/Library; fi
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_SYSTEM_LIBRARY/Libraries; fi
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then GNUSTEP_SYSTEM_HEADERS=$GNUSTEP_SYSTEM_LIBRARY/Headers; fi

16
configure.ac
View file

@ -222,14 +222,12 @@ then
GNUSTEP_DEFAULT_CONFIG="$result"
fi
if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then
# On platforms other than mingw we can fall back to GNUSTEP_CONFIG_FILE
# which (if undefined) will already have been set to the value of
# GNUSTEP_MAKE_CONFIG.
# On mingw we must never use GNUSTEP_MAKE_CONFIG ... as the paths from
# the make package are for building and are guaranteed to be wrong for
# use at runtime. We set $GNUSTEP_CONFIG_FILE to ./GNUstep.conf
# earlier to handle that case.
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE"
# We fall back to useing the make settings for the built-in ones.
# However, on mingw these will be msys style paths, and we don't
# want that ... so later on we convert these to portable relative
# paths based on the directory in which the base library will be
# installed.
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_MAKE_FILE"
fi
AC_MSG_RESULT($GNUSTEP_DEFAULT_CONFIG)
@ -265,7 +263,7 @@ if test x"$GNUSTEP_MAKEFILES" = x""; then GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps; fi
if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps/Admin; fi
if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools; fi
if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi
if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_ADMIN_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi
if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_SYSTEM_ROOT/Library; fi
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_SYSTEM_LIBRARY/Libraries; fi
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then GNUSTEP_SYSTEM_HEADERS=$GNUSTEP_SYSTEM_LIBRARY/Headers; fi