| @@ -1,22 +1,44 @@ | | | @@ -1,22 +1,44 @@ |
1 | $NetBSD: patch-aa,v 1.5 2015/01/04 10:43:44 wiz Exp $ | | 1 | $NetBSD: patch-aa,v 1.6 2021/11/06 09:49:20 nia Exp $ |
| | | 2 | |
| | | 3 | Honor CC, CFLAGS. Use LDFLAGS when linking. |
2 | | | 4 | |
3 | --- Makefile.orig 2010-08-07 13:06:42.000000000 +0000 | | 5 | --- Makefile.orig 2010-08-07 13:06:42.000000000 +0000 |
4 | +++ Makefile | | 6 | +++ Makefile |
5 | @@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1 | | 7 | @@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1 |
6 | OPT = -O -Wall | | 8 | OPT = -O -Wall |
7 | # For MWC 3.0 on the Atari ST, use: | | 9 | # For MWC 3.0 on the Atari ST, use: |
8 | #CFLAGS = -VCOMPAC -VPEEP | | 10 | #CFLAGS = -VCOMPAC -VPEEP |
9 | -CFLAGS = $(OPT) $(SYSTEM) | | 11 | -CFLAGS = $(OPT) $(SYSTEM) |
10 | +CFLAGS += ${SYSTEM} | | 12 | +CFLAGS += ${SYSTEM} |
11 | | | 13 | |
12 | # GNU's gcc is very nice, if you've got it. Otherwise just cc. | | 14 | # GNU's gcc is very nice, if you've got it. Otherwise just cc. |
13 | #CC = cgcc -mshort -mbaserel | | 15 | #CC = cgcc -mshort -mbaserel |
14 | -CC = cc | | 16 | -CC = cc |
15 | +#CC = cc | | 17 | +#CC = cc |
16 | | | 18 | |
17 | # tmclock is only needed on Unix systems... | | 19 | # tmclock is only needed on Unix systems... |
18 | -TMCLOCK = tmclock.o | | 20 | -TMCLOCK = tmclock.o |
19 | +#TMCLOCK = tmclock.o | | 21 | +#TMCLOCK = tmclock.o |
20 | | | 22 | |
21 | # Integer-only stdio routines for Atari ST. | | 23 | # Integer-only stdio routines for Atari ST. |
22 | #LIBS=-liio16 | | 24 | #LIBS=-liio16 |
| | | 25 | @@ -69,10 +69,10 @@ MOBJ = marc.o arcdata.o arcdos.o arcio.o |
| | | 26 | all: arc$(PROG) marc$(PROG) |
| | | 27 | |
| | | 28 | arc$(PROG): $(OBJS) $(TMCLOCK) |
| | | 29 | - $(CC) $(OPT) -o arc$(PROG) $(OBJS) $(TMCLOCK) $(LIBS) |
| | | 30 | + $(CC) $(OPT) $(LDFLAGS) -o arc$(PROG) $(OBJS) $(TMCLOCK) $(LIBS) |
| | | 31 | |
| | | 32 | marc$(PROG): $(MOBJ) $(TMCLOCK) |
| | | 33 | - $(CC) $(OPT) -o marc$(PROG) $(MOBJ) $(TMCLOCK) $(LIBS) |
| | | 34 | + $(CC) $(OPT) $(LDFLAGS) -o marc$(PROG) $(MOBJ) $(TMCLOCK) $(LIBS) |
| | | 35 | |
| | | 36 | clean: |
| | | 37 | rm -f *.o arc$(PROG) marc$(PROG) |
| | | 38 | @@ -137,4 +137,4 @@ install: all |
| | | 39 | install -s -m 0755 -D marc $(DESTDIR)$(PREFIX)/bin/marc |
| | | 40 | install -m 0644 -D arc.1 $(DESTDIR)$(PREFIX)/share/man/man1/arc.1 |
| | | 41 | install -m 0644 -D marc.1 $(DESTDIR)$(PREFIX)/share/man/man1/marc.1 |
| | | 42 | - |
| | | 43 | \ No newline at end of file |
| | | 44 | + |