| @@ -1,17 +1,28 @@ | | | @@ -1,17 +1,28 @@ |
1 | $NetBSD: patch-aa,v 1.1.1.1 2004/02/13 23:00:36 minskim Exp $ | | 1 | $NetBSD: patch-aa,v 1.2 2011/11/29 06:11:53 sbd Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 2003-08-22 19:53:29.000000000 -0500 | | 3 | Honor CC, CFLAGS and LDFLAGS from pkgsrc. |
| | | 4 | |
| | | 5 | --- Makefile.orig 2003-08-23 00:53:29.000000000 +0000 |
4 | +++ Makefile | | 6 | +++ Makefile |
5 | @@ -16,10 +16,10 @@ ZLIB = -lz | | 7 | @@ -16,10 +16,10 @@ ZLIB = -lz |
6 | UNIX = -DUNIX | | 8 | UNIX = -DUNIX |
7 | | | 9 | |
8 | # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use: | | 10 | # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use: |
9 | -CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer -march=pentiumpro | | 11 | -CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer -march=pentiumpro |
10 | +CFLAGS += $(USEZ) $(DOS) $(UNIX) | | 12 | +CFLAGS += $(USEZ) $(DOS) $(UNIX) |
11 | | | 13 | |
12 | L = $(ZLIB) | | 14 | L = $(ZLIB) |
13 | -CC = gcc | | 15 | -CC = gcc |
14 | +#CC = gcc | | 16 | +#CC = gcc |
15 | DESTDIR = /usr/local/bin | | 17 | DESTDIR = /usr/local/bin |
16 | MANDIR = /usr/local/man/man1 | | 18 | MANDIR = /usr/local/man/man1 |
17 | DOCDIR = /usr/local/doc/atasm | | 19 | DOCDIR = /usr/local/doc/atasm |
| | | 20 | @@ -37,7 +37,7 @@ setparse.o: symbol.h |
| | | 21 | inc_path.o: inc_path.h inc_path.c |
| | | 22 | |
| | | 23 | prog : $(OBJS) |
| | | 24 | - $(CC) -o atasm $(OBJS) $(L) |
| | | 25 | + $(CC) $(LDFLAGS) -o atasm $(OBJS) $(L) |
| | | 26 | |
| | | 27 | clean: |
| | | 28 | rm -f *.rej *.o *~ atasm atasm.1 atasm.exe |