mirror of
https://github.com/gnustep/libs-back.git
synced 2025-02-22 19:31:19 +00:00
Update for filesystem changes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24585 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
368694c180
commit
15eba804f3
2 changed files with 8 additions and 12 deletions
10
configure
vendored
10
configure
vendored
|
@ -2385,11 +2385,7 @@ unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
|||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test x"$GNUSTEP_IS_FLATTENED" = x""; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
|
@ -2401,10 +2397,12 @@ if test "$GNUSTEP_IS_FLATTENED" = no; then
|
|||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
|
||||
fi
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS"
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
|
||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
10
configure.ac
10
configure.ac
|
@ -64,11 +64,7 @@ unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
|||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test x"$GNUSTEP_IS_FLATTENED" = x""; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
|
@ -80,10 +76,12 @@ if test "$GNUSTEP_IS_FLATTENED" = no; then
|
|||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
|
||||
fi
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS"
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
|
||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue