From 4e24f984d173c91756ff12dd88d09bd29897a4ca Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Sat, 19 Feb 2000 00:40:47 +0000 Subject: [PATCH] Merge from 0.6.5 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@6040 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 29 ++++++++++ GNUmakefile.in | 4 +- GNUstep.csh.in | 6 +- GNUstep.sh.in | 6 +- bundle.make | 11 ++-- common.make | 2 + config.guess | 114 ++++++++++++++++++++++++------------ config.sub | 58 ++++++++++++++----- ctool.make | 2 +- gnustep-make.spec | 145 ++++++++++++++++++++++++++++++++++++++++++++++ gswbundle.make | 2 +- objc.make | 2 +- palette.make | 11 ++-- tool.make | 2 +- 14 files changed, 323 insertions(+), 71 deletions(-) create mode 100644 gnustep-make.spec diff --git a/ChangeLog b/ChangeLog index f2db6a70e..6a7d7e5ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,35 @@ * rules.make: Revert previous change of parens around tmp. +2000-02-18 Adam Fedor + + * Version: 0.6.5 Released. + +2000-02-16 Adam Fedor + + * GNUmakefile.in: Standardize prefix/GNUSTEP_INSTALLATION_DIR + settings. + * gnustep-make.spec: Newfile + + * common.make: Add default installation dirs. + * bundle.make: Use default installation dir. + * ctool.make: Likewise. + * objc.make: Likewise. + * palette.make: Likewise. + * tool.make: Likewise. + + * GNUstep.csh.in: Use pushd/popd to changes dirs. + +2000-02-08 Adam Fedor + + * config.guess: New version + * config.sub: Likewise. + +2000-01-24 Adam Fedor + + * names.make (GNUSTEP_HOST_GUESS): New variable. Evaluate config.guess + and config.sub separately. + 2000-01-22 Manuel Guesdon * gswapp.make and gswbundle.make: tar options changed diff --git a/GNUmakefile.in b/GNUmakefile.in index 717b49dec..93479cd25 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -28,10 +28,10 @@ include config.make +prefix = @prefix@ +GNUSTEP_INSTALLATION_DIR=$(prefix) GNUSTEP_PREFIX = @GNUSTEP_PREFIX@ -GNUSTEP_INSTALLATION_DIR = @prefix@ srcdir = @srcdir@ -prefix = $(GNUSTEP_INSTALLATION_DIR) exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ diff --git a/GNUstep.csh.in b/GNUstep.csh.in index d45a19292..dfbce6420 100755 --- a/GNUstep.csh.in +++ b/GNUstep.csh.in @@ -44,8 +44,10 @@ endif # Determine the host information # if ( ! ${?GNUSTEP_HOST} ) then - setenv GNUSTEP_HOST `(cd /tmp; ${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.guess)` - setenv GNUSTEP_HOST `(cd /tmp; ${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.sub ${GNUSTEP_HOST})` + pushd /tmp > /dev/null + setenv GNUSTEP_HOST `${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.guess` + setenv GNUSTEP_HOST `${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.sub ${GNUSTEP_HOST}` + popd > /dev/null endif setenv GNUSTEP_HOST_CPU `${GNUSTEP_SYSTEM_ROOT}/Makefiles/cpu.sh $GNUSTEP_HOST` setenv GNUSTEP_HOST_VENDOR `${GNUSTEP_SYSTEM_ROOT}/Makefiles/vendor.sh $GNUSTEP_HOST` diff --git a/GNUstep.sh.in b/GNUstep.sh.in index 6ee937414..a1da5322a 100755 --- a/GNUstep.sh.in +++ b/GNUstep.sh.in @@ -47,8 +47,10 @@ export GNUSTEP_MAKEFILES # Determine the host information # if [ -z "$GNUSTEP_HOST" ]; then - GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.guess)` - GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.sub $GNUSTEP_HOST)` + pushd /tmp + GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.guess` + GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.sub $GNUSTEP_HOST` + popd fi GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_HOST` GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_HOST` diff --git a/bundle.make b/bundle.make index a12cb70b6..06f34bff0 100644 --- a/bundle.make +++ b/bundle.make @@ -123,14 +123,17 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \ echo "}") >$@ -internal-bundle-install:: $(BUNDLE_INSTALL_DIR) - tar cf - $(BUNDLE_DIR_NAME) | (cd $(BUNDLE_INSTALL_DIR); tar xf -) +internal-bundle-install:: internal-install-dirs + tar cf - $(BUNDLE_DIR_NAME) | (cd $(GNUSTEP_BUNDLES); tar xf -) -$(BUNDLE_DIR_NAME)/Resources $(BUNDLE_INSTALL_DIR):: +internal-install-dirs:: + $(MKDIRS) $(GNUSTEP_BUNDLES) + +$(BUNDLE_DIR_NAME)/Resources $(GNUSTEP_BUNDLES):: @$(MKDIRS) $@ internal-bundle-uninstall:: - rm -rf $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME) + rm -rf $(GNUSTEP_BUNDLES)/$(BUNDLE_DIR_NAME) # # Cleaning targets diff --git a/common.make b/common.make index ed1bc72db..05a42a64e 100644 --- a/common.make +++ b/common.make @@ -93,6 +93,8 @@ GNUSTEP_APPS = $(GNUSTEP_INSTALLATION_DIR)/Apps GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools GNUSTEP_SERVICES = $(GNUSTEP_INSTALLATION_DIR)/Library/Services GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Headers +GNUSTEP_BUNDLES = $(GNUSTEP_INSTALLATION_DIR)/Library/Bundles +GNUSTEP_PALETTES = $(GNUSTEP_INSTALLATION_DIR)/Developer/Palettes GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Libraries GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR) GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO) diff --git a/config.guess b/config.guess index b2068411f..c97b12ce3 100755 --- a/config.guess +++ b/config.guess @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it @@ -23,8 +23,7 @@ # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. -# Please send patches to the Autoconf mailing list . +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -156,6 +155,9 @@ EOF wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -289,6 +291,7 @@ EOF mips:*:*:UMIPS | mips:*:*:RISCos) sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -328,15 +331,18 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -453,7 +459,7 @@ EOF exit (0); } EOF - ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` @@ -547,10 +553,13 @@ EOF -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*T3E:*:*:*) - echo t3e-cray-unicosmk${UNAME_RELEASE} + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos @@ -588,7 +597,7 @@ EOF echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` @@ -617,16 +626,7 @@ EOF *:GNU:*:*) echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; - armv4l:[lL]inux:*:*) - echo arm-unknown-linux-gnuelf - exit 0;; *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - armv*) UNAME_MACHINE=$UNAME_MACHINE ;; - arm* | sa110*) UNAME_MACHINE="arm" ;; - esac # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -639,12 +639,39 @@ EOF s/ .*// p'` case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) + *ia64) + echo "${UNAME_MACHINE}-unknown-linux" + exit 0 + ;; + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + sparclinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + armlinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32arm*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + armelf_linux*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + m68klinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32ppc | elf32ppclinux) # Determine Lib Version cat >$dummy.c < @@ -673,7 +700,9 @@ EOF fi fi rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; + echo powerpc-unknown-linux-gnu${LIBC} + exit 0 + ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then @@ -727,6 +756,7 @@ EOF elif test "${UNAME_MACHINE}" = "mips" ; then cat >$dummy.c < /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -763,6 +793,7 @@ EOF cat >$dummy.c < #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -800,19 +831,21 @@ EOF echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; i?86:*:5:7*) - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + # Fixed at (any) Pentium or better + UNAME_MACHINE=i586 + if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then + echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + fi exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -832,7 +865,11 @@ EOF echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i?86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) + # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp @@ -946,6 +983,9 @@ EOF *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; + *:QNX:*:4*) + echo i386-qnx-qnx${UNAME_VERSION} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.sub b/config.sub index 2436b4534..1819e437a 100755 --- a/config.sub +++ b/config.sub @@ -1,6 +1,8 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. +# # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -25,6 +27,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Written by Per Bothner . +# Please send patches to . +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. @@ -105,7 +110,7 @@ case $os in -scout) ;; -wrs) - os=vxworks + os=-vxworks basic_machine=$1 ;; -hiux*) @@ -156,13 +161,17 @@ case $os in -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ @@ -171,12 +180,12 @@ case $basic_machine in | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el \ + | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v) + | thumb | d10v | fr30) basic_machine=$basic_machine-unknown ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) ;; # We use `pc' rather than `unknown' @@ -191,7 +200,8 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ @@ -204,10 +214,10 @@ case $basic_machine in | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ | f301-* | armv*-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) + | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -425,7 +435,6 @@ case $basic_machine in ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) @@ -460,6 +469,9 @@ case $basic_machine in basic_machine=i386-unknown os=-mingw32 ;; + i386-qnx | qnx) + basic_machine=i386-qnx + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -488,7 +500,7 @@ case $basic_machine in miniframe) basic_machine=m68000-convergent ;; - *mint | *MiNT) + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; @@ -506,6 +518,10 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -514,6 +530,10 @@ case $basic_machine in basic_machine=i386-unknown os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -523,7 +543,7 @@ case $basic_machine in os=-netbsd ;; netwinder) - basic_machine=armv4l-corel + basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) @@ -907,12 +927,12 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) + | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` @@ -926,6 +946,9 @@ case $os in -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; -osfrose*) os=-osfrose ;; @@ -963,6 +986,9 @@ case $os in -oss*) os=-sysv3 ;; + -qnx) + os=-qnx4 + ;; -svr4) os=-sysv4 ;; @@ -1012,7 +1038,7 @@ case $basic_machine in *-acorn) os=-riscix1.2 ;; - arm*-corel) + arm*-rebel) os=-linux ;; arm*-semi) @@ -1186,7 +1212,7 @@ case $basic_machine in -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) diff --git a/ctool.make b/ctool.make index cf89bb98d..6d5566f9b 100644 --- a/ctool.make +++ b/ctool.make @@ -40,7 +40,7 @@ include $(GNUSTEP_MAKEFILES)/rules.make # directory they will get installed in the GNUstep system root. ifeq ($(TOOL_INSTALLATION_DIR),) TOOL_INSTALLATION_DIR = \ - $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) + $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) endif ifeq ($(INTERNAL_ctool_NAME),) diff --git a/gnustep-make.spec b/gnustep-make.spec new file mode 100644 index 000000000..764d346f8 --- /dev/null +++ b/gnustep-make.spec @@ -0,0 +1,145 @@ +# This package is not relocatable +%define ver 0.6.5 +%define date 20000217 +%define prefix /usr +%define gsr %{prefix}/GNUstep +%define libcombo gnu-gnu-gnu-xgps +Name: gnustep-make +Version: %{ver} +Release: 1 +Source: ftp://ftp.gnustep.org/pub/gnustep/core/gstep-make-%{ver}.tar.gz +Copyright: GPL +Group: System Environment/Base +Summary: GNUstep Makefile package +Packager: Christopher Seawood +Distribution: Seawood's Random RPMS (%{_buildsym}) +Vendor: The Seawood Project +URL: http://www.gnustep.org/ +BuildRoot: /var/tmp/build-%{name} +Conflicts: gnustep-core + +%description +This package contains the basic tools needed to run GNUstep applications. +Library combo is %{libcombo}. +%{_buildblurb} + +%package devel +Summary: Files needed to develop applications with gnustep-make +Group: Development/Tools +Requires: %{name} = %{ver} + +%description devel +The makefile package is a simplistic, powerful and extensible way to +write makefiles for a GNUstep-based project. It allows the user to +write a GNUstep-based project without having to deal with the complex +issues associated with the configuration and installation of the core +GNUstep libraries. It also allows the user to easily create +cross-compiled binaries. +Library combo is %{libcombo}. +%{_buildblurb} + +%prep +%setup -q -n gstep-%{ver}/make +%patch -p2 -b .nodupsh + +%build +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gsr} --with-library-combo=%{libcombo} +make + +%install +rm -rf $RPM_BUILD_ROOT +make install GNUSTEP_INSTALLATION_DIR=${RPM_BUILD_ROOT}%{gsr} + +tmp1=`./config.guess` +tmp2=`./cpu.sh $tmp1` +tmp3=`./vendor.sh $tmp1` +tmp4=`./os.sh $tmp1` +tmp5=`./clean_cpu.sh $tmp2` +tmp6=`./clean_vendor.sh $tmp3` +tmp7=`./clean_os.sh $tmp4` + +%ifos Linux +mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d +# Create profile files +cat > mygnustep.sh << EOF +#!/bin/sh +. %{gsr}/Makefiles/GNUstep.sh +EOF + +cat > mygnustep.csh << EOF +#!/bin/csh +source %{gsr}/Makefiles/GNUstep.csh +EOF + +chmod 755 mygnustep.* +mv mygnustep.sh $RPM_BUILD_ROOT/etc/profile.d/GNUstep.sh +mv mygnustep.csh $RPM_BUILD_ROOT/etc/profile.d/GNUstep.csh +%endif + +cat > filelist.rpm.in << EOF +%defattr (-, bin, bin) +%doc COPYING DESIGN README +%ifos Linux +%config /etc/profile.d/GNUstep.csh +%config /etc/profile.d/GNUstep.sh +%endif + +%dir %{gsr} +%dir %{gsr}/share +%dir %{gsr}/Apps +%dir %{gsr}/Makefiles +%dir %{gsr}/Makefiles/GSARCH +%dir %{gsr}/Makefiles/GSARCH/GSOS +%dir %{gsr}/Library +%dir %{gsr}/Library/info +%dir %{gsr}/Library/PostScript +%dir %{gsr}/Library/Services +%dir %{gsr}/Library/man +%dir %{gsr}/Tools + +%{gsr}/Makefiles/config* +%{gsr}/Makefiles/*.csh +%{gsr}/Makefiles/*.sh +%{gsr}/Makefiles/GSARCH/GSOS/which_lib + +%{gsr}/Tools/debugapp +%{gsr}/Tools/openapp +%{gsr}/Tools/opentool + +EOF + +cat > filelist-devel.rpm.in << EOF +%defattr (-, bin, bin) +%config %{gsr}/share/config.site +%config %{gsr}/Makefiles/GSARCH/GSOS/config.make + +%{gsr}/Makefiles/*.func +%{gsr}/Makefiles/*.make +%{gsr}/Makefiles/*.template +%{gsr}/Makefiles/install-sh +%{gsr}/Makefiles/mkinstalldirs + +EOF + +sed -e "s|GSARCH|${tmp5}|" -e "s|GSOS|${tmp7}|" < filelist.rpm.in > filelist.rpm +sed -e "s|GSARCH|${tmp5}|" -e "s|GSOS|${tmp7}|" < filelist-devel.rpm.in > filelist-devel.rpm + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f filelist.rpm +%files -f filelist-devel.rpm devel + +%changelog +* Sat Sep 18 1999 Christopher Seawood +- Version 0.6.0 +- Added nodupsh patch + +* Sat Aug 07 1999 Christopher Seawood +- Updated to cvs dawn_6 branch + +* Fri Jun 25 1999 Christopher Seawood +- Split into separate rpm from gnustep-core +- Build from cvs snapshot +- Added services patch + diff --git a/gswbundle.make b/gswbundle.make index f20de6a28..7cc176938 100644 --- a/gswbundle.make +++ b/gswbundle.make @@ -37,7 +37,7 @@ GSWBUNDLE_LD= $(BUNDLE_LD) GSWBUNDLE_LDFLAGS = $(BUNDLE_LDFLAGS) ifeq ($(GSWBUNDLE_INSTALL_DIR),) -GSWBUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Librairies +GSWBUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Libraries endif # The name of the bundle is in the BUNDLE_NAME variable. # The list of languages the bundle is localized in are in xxx_LANGUAGES diff --git a/objc.make b/objc.make index 8b69ee79e..2e7b76973 100644 --- a/objc.make +++ b/objc.make @@ -59,7 +59,7 @@ else # don't specify a directory they will get installed in the GNUstep # system root. OBJC_PROGRAM_INSTALLATION_DIR = \ - $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_TARGET_DIR) + $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR) ALL_OBJC_LIBS = $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \ $(TARGET_SYSTEM_LIBS) diff --git a/palette.make b/palette.make index d6168d067..e74c4e093 100644 --- a/palette.make +++ b/palette.make @@ -145,14 +145,17 @@ $(PALETTE_DIR_NAME)/Resources/palette.table: $(PALETTE_DIR_NAME)/Resources fi; \ ) >$@ -internal-palette-install:: $(PALETTE_INSTALL_DIR) - tar cf - $(PALETTE_DIR_NAME) | (cd $(PALETTE_INSTALL_DIR); tar xf -) +internal-palette-install:: internal-install-dirs + tar cf - $(PALETTE_DIR_NAME) | (cd $(GNUSTEP_PALETTES); tar xf -) -$(PALETTE_DIR_NAME)/Resources $(PALETTE_INSTALL_DIR):: +internal-install-dirs:: + $(MKDIRS) $(GNUSTEP_PALETTES) + +$(PALETTE_DIR_NAME)/Resources $(GNUSTEP_PALETTES):: @$(MKDIRS) $@ internal-palette-uninstall:: - rm -rf $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME) + rm -rf $(GNUSTEP_PALETTES)/$(PALETTE_DIR_NAME) # # Cleaning targets diff --git a/tool.make b/tool.make index a32394579..3212cf452 100644 --- a/tool.make +++ b/tool.make @@ -40,7 +40,7 @@ include $(GNUSTEP_MAKEFILES)/rules.make # directory they will get installed in the GNUstep system root. ifeq ($(TOOL_INSTALLATION_DIR),) TOOL_INSTALLATION_DIR = \ - $(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) + $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) endif ifeq ($(INTERNAL_tool_NAME),)