+2000-12-03 Laurynas Biveinis <lauras@softhome.net>
+ Bruce Korb <bkorb@gnu.org>
+
+ * Makefile.in: pass $(build_canonical) to mkfixinc.sh.
+ * fixinc/mkfixinc.sh: accept build system name as an argument.
+ Use it for choosing the fix build method. Use the target for
+ selecting special fix rules.
+
2000-12-03 Bernd Schmidt <bernds@redhat.co.uk>
* Makefile.in (OBJS): Add sched-deps.o.
$(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def specs.ready
(MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc && pwd` ; \
CC="$(CC)"; CFLAGS="$(CFLAGS)"; LDFLAGS="$(LDFLAGS)"; \
- export MAKE srcdir CC CFLAGS LDFLAGS; \
- cd ./fixinc && $(SHELL) $${srcdir}/mkfixinc.sh $(target))
+ export MAKE srcdir CC CFLAGS LDFLAGS; cd ./fixinc && \
+ $(SHELL) $${srcdir}/mkfixinc.sh $(canonical_build) $(target))
# Build fixed copies of system files.
stmp-fixinc: fixinc.sh gsyslimits.h
#! /bin/sh
-machine=$1
+build=$1
+machine=$2
+
+if [ -z "$build" ]
+then
+ echo No build system name given
+ exit 1
+fi
+
if [ -z "$machine" ]
then
echo No machine name given
target=../fixinc.sh
-echo constructing ${target} for $machine
+echo constructing ${target} for $machine to run on $build
fixincludes="${machine}"
-case $machine in
- *-*-linux*)
- :
+# Choose fix build method by build system
+case $build in
+ i?86-*-msdosdjgpp* )
+ MAKE="${MAKE} -f ${srcdir}/Makefile.DOS srcdir=${srcdir}"
;;
- *-*-sysv4*)
- fixincludes=fixinc.svr4
+ *-*-beos* )
+ MAKE="${MAKE} -f ${srcdir}/Makefile.BEOS srcdir=${srcdir}"
+ # Remove the following line to enable fixincludes
+ # (Makefile.BEOS is empty until Monday 12/4/00 :)
+ fixincludes=
+ ;;
+
+ * )
+ MAKE="${MAKE} -f Makefile"
;;
+esac
+# Check for special fix rules for particular targets
+case $machine in
+ *-*-sysv4* | \
i?86-*-sysv5* | \
i?86-*-udk*)
fixincludes=fixinc.svr4
fixincludes=fixinc.ptx
;;
- i?86-*-msdosdjgpp* )
- MAKE="${MAKE} -f ${srcdir}/Makefile.DOS srcdir=${srcdir}"
- ;;
-
- *-*-beos* )
- MAKE="${MAKE} -f ${srcdir}/Makefile.BEOS srcdir=${srcdir}"
- # Remove the following line to enable fixincludes
- fixincludes=
- ;;
-
alpha*-dec-vms* | \
arm-semi-aout | armel-semi-aout | \
arm-semi-aof | armel-semi-aof | \