From b5dac1e3bdd01a2ce105df747a9073ff0d6a94e2 Mon Sep 17 00:00:00 2001
From: Robert de Bath <rdebath@poboxes.com>
Date: Sun, 2 Nov 2003 09:31:19 +0100
Subject: Import Dev86src-0.16.14.tar.gz

---
 makefile.in | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'makefile.in')

diff --git a/makefile.in b/makefile.in
index ac4c989..c026376 100644
--- a/makefile.in
+++ b/makefile.in
@@ -27,7 +27,7 @@ MAKEX=
 # files. This should be fine for Linux, but it won't be for AIX etc.
 # Unfortunatly it's even _required_ for linux because some versions
 # of Redhat have a broken standard ar command.
-#ifdef __linux__
+#ifdef __linux_i386__
 AR=ar86
 #endif
 
@@ -68,21 +68,22 @@ BCCARCH =-Mf -O
 #endif
 #endif
 
-# Alter these if for some reason you don't want this done as root.
-#ifdef __CYGWIN__
-INDAT=-m 644
-INEXE=-m 755
-INSCR=-m 755
-#else
-#ifdef __BCC__
-INDAT=-o root -g root -m 644
-INEXE=-o root -g root -m 755
-INSCR=-o root -g root -m 755
-#else
+# Apple cpp-precomp 6.14 (devkit-213/devkit_tools-214) cannot
+# handle the QUOT macro in bcc. It puts a space in /usr so that
+# it becomes / usr
+#ifdef __APPLE__
+CFLAGS += -no-cpp-precomp
+#endif
+
+# Yet again other systems have general weirdness here.
+#ifdef __linux__
 INDAT=-o root -g root -m 644
 INEXE=-o root -g root -m 755 -s
 INSCR=-o root -g root -m 755
-#endif
+#else
+INDAT=-m 644
+INEXE=-m 755
+INSCR=-m 755
 #endif
 
 #ifdef __CYGWIN__
@@ -188,14 +189,10 @@ objdump86: bindir
 elksemu: bindir
 #ifndef __AS386_16__
 #ifdef __linux_i386__
-	$(MAKEC) elksemu \
-	CC='$(CC)' PREFIX=$(PREFIX) LIBPRE='$(LIBPRE)' LIBDIR='$(LIBDIR)' BINDIR='$(BINDIR)' \
-	elksemu
-#else
 	$(MAKEC) elksemu CC='ncc' elksemu
-#endif
 	cp -p elksemu/elksemu bin/elksemu
 #endif
+#endif
 
 install-ln: bcc cpp unproto copt as86 ar86 ld86 elksemu
 	install -d $(DISTBIN)
@@ -205,7 +202,9 @@ install-ln: bcc cpp unproto copt as86 ar86 ld86 elksemu
 	ln -fs `pwd`/bin/ar86 		$(DISTBIN)/ar86
 	ln -fs `pwd`/bin/ld86 		$(DISTBIN)/ld86
 #ifndef __AS386_16__
+#ifdef __linux_i386__
 	ln -fs `pwd`/bin/elksemu 	$(DIST)/lib/elksemu
+#endif
 #endif
 	-install -d $(DIST)/usr/lib
 	-install $(INDAT) libc/error/liberror.txt $(DIST)/usr/lib/liberror.txt
@@ -231,9 +230,11 @@ install-bcc: bcc cpp unproto copt as86 ar86 ld86 objdump86
 # NB: This doesn't install as a suid root, that's ok though.
 install-emu: elksemu
 #ifndef __AS386_16__
+#ifdef __linux_i386__
 	install -d $(DIST)/lib
 	install $(INEXE) bin/elksemu 	$(DIST)/lib/elksemu
 #endif
+#endif
 
 install-man:
 	-$(MAKEC) man MANDIR=$(DIST)$(PREFIX)/man install
@@ -287,10 +288,11 @@ lib-bsd: bindir
 
 #ifdef __AS386_16__
 alt-libs: lib-stand lib-dos lib-fast 
+	@touch lib/lib1-done
 #else
 alt-libs: lib-stand lib-dos lib-386 lib-fast 
-#endif
 	@touch lib/lib1-done
+#endif
 
 lib-fast: bindir
 	test -f bin/ncc
-- 
cgit v1.2.1