mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
For autoconf packages in the GNUstep directory
structure, the headers and libraries must go into the appropriate target subdirectory. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2442 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6a527381e3
commit
3a4c08e0af
3 changed files with 15 additions and 8 deletions
|
@ -1,3 +1,10 @@
|
|||
Wed Sep 24 14:00:03 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* Makefile.in: Run scripts in current directory.
|
||||
* config.site: For autoconf packages in the GNUstep directory
|
||||
structure, the headers and libraries must go into the appropriate
|
||||
target subdirectory.
|
||||
|
||||
Tue Sep 23 15:18:08 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* application.make: Utilize object directory.
|
||||
|
|
|
@ -37,9 +37,9 @@ datadir = @datadir@
|
|||
GNUSTEP_TARGET_CPU := @target_cpu@
|
||||
GNUSTEP_TARGET_OS := @target_os@
|
||||
|
||||
GNUSTEP_TARGET_CPU := $(shell clean_cpu.sh $(GNUSTEP_TARGET_CPU))
|
||||
GNUSTEP_TARGET_VENDOR := $(shell clean_vendor.sh $(GNUSTEP_TARGET_VENDOR))
|
||||
GNUSTEP_TARGET_OS := $(shell clean_os.sh $(GNUSTEP_TARGET_OS))
|
||||
GNUSTEP_TARGET_CPU := $(shell ./clean_cpu.sh $(GNUSTEP_TARGET_CPU))
|
||||
GNUSTEP_TARGET_VENDOR := $(shell ./clean_vendor.sh $(GNUSTEP_TARGET_VENDOR))
|
||||
GNUSTEP_TARGET_OS := $(shell ./clean_os.sh $(GNUSTEP_TARGET_OS))
|
||||
|
||||
makedir = $(prefix)/Makefiles
|
||||
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
||||
|
|
10
config.site
10
config.site
|
@ -33,9 +33,9 @@ if test "$target" = NONE ; then
|
|||
else
|
||||
# The user did specify a target, so canonicalize and clean
|
||||
GNUSTEP_TARGET=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $target`
|
||||
GNUSTEP_TARGET_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $target`
|
||||
GNUSTEP_TARGET_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $target`
|
||||
GNUSTEP_TARGET_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $target`
|
||||
GNUSTEP_TARGET_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_TARGET`
|
||||
GNUSTEP_TARGET_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_TARGET`
|
||||
GNUSTEP_TARGET_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_TARGET`
|
||||
fi
|
||||
|
||||
# Clean the target
|
||||
|
@ -70,12 +70,12 @@ fi
|
|||
|
||||
# Change the library directory default
|
||||
if test "$libdir" = "\${exec_prefix}/lib" ; then
|
||||
libdir="\${exec_prefix}/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
|
||||
libdir="\${exec_prefix}/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
|
||||
fi
|
||||
|
||||
# Change the include directory default
|
||||
if test "$includedir" = "\${prefix}/include" ; then
|
||||
includedir="\${prefix}/Headers"
|
||||
includedir="\${prefix}/Headers/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
|
||||
fi
|
||||
|
||||
# xxx What about oldincludedir?
|
||||
|
|
Loading…
Reference in a new issue