From: niklas <niklas@openbsd.org>
Date: Sat, 22 Mar 1997 00:19:56 +0000 (+0000)
Subject: Make this build work with objdirs, at least as links
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8e7c11d177e533da0a9b22df125247661f497b0a;p=openbsd

Make this build work with objdirs, at least as links
Still need work for plain obj dirs.
---

diff --git a/sys/arch/amiga/stand/boot/Makefile b/sys/arch/amiga/stand/boot/Makefile
index 4dc2b872c9d..79cd0b85032 100644
--- a/sys/arch/amiga/stand/boot/Makefile
+++ b/sys/arch/amiga/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1997/01/16 09:26:21 niklas Exp $
+#	$OpenBSD: Makefile,v 1.2 1997/03/22 00:19:56 niklas Exp $
 
 NOPROG=	installboot
 MAN=installboot.8
@@ -34,7 +34,9 @@ COPTS += -Wall -Wstrict-prototypes
 
 BOOTBLOCKS=xxboot # XXX  fdboot is too large at the moment.
 
-.s.o: ; $(CC) $(CAFLAGS) $(COPTS) -x assembler-with-cpp -o $*.o -c $*.s
+.s.o:
+	$(CC) $(CAFLAGS) $(COPTS) -x assembler-with-cpp -o $*.o -c \
+	    ${.CURDIR}/$*.s
 
 #libs:
 
@@ -49,10 +51,10 @@ all: $(BOOTBLOCKS) installboot
 $(OBJS): txlt
 
 xxstart.s: bbstart.s
-	cpp bbstart.s > $@
+	cpp ${.CURDIR}/bbstart.s > $@
 	
 fdstart.s: bbstart.s
-	cpp -DAUTOLOAD=8192 bbstart.s > $@
+	cpp -DAUTOLOAD=8192 ${.CURDIR}/bbstart.s > $@
 
 x.out: xxstart.o $(OBJS) $(LIBS)
 	$(LD) $(LDFLAGS) -r -dc -e _start -o x.out xxstart.o $(OBJS) $(LIBS)