mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
Use the new GNUSTEP_IS_FLATTENED variable, and default to flattened if nothing better specified
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23719 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
cfaf083d90
commit
6aec2db2f8
7 changed files with 58 additions and 26 deletions
6
SSL/configure
vendored
6
SSL/configure
vendored
|
@ -1350,13 +1350,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
else
|
||||
if test "$GNUSTEP_IS_FLATTENED" = no; then
|
||||
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
|
@ -42,13 +42,13 @@ AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
|
|||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
else
|
||||
if test "$GNUSTEP_IS_FLATTENED" = no; then
|
||||
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue