Respect CC and CFLAGS

1 files changed, 42 insertions, 40 deletions

diff --git a/editors/uzap/files/patch-a b/editors/uzap/files/patch-a
index 6593df88550c..1e1f4624888d 100644
--- a/editors/uzap/files/patch-a
+++ b/editors/uzap/files/patch-a
@@ -1,40 +1,42 @@
-*** Makefile.orig	Thu Mar 30 20:04:11 1989
---- Makefile	Mon Jun 19 22:15:57 1995
-***************
-*** 1,7 ****
-  # Makefile for Uzap.
-! BINDIR = /usr/local
-! MANDIR = /usr/man/manl
-! MSECT = l
-  
-  uzap: uzap.o edit.o search.o screen.o
-  	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
---- 1,9 ----
-  # Makefile for Uzap.
-! BINDIR = ${PREFIX}/bin/
-! MANDIR = ${PREFIX}/man/man1
-! MSECT = 1
-! 
-! all: uzap
-  
-  uzap: uzap.o edit.o search.o screen.o
-  	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
-***************
-*** 19,26 ****
-  	cc -c -O screen.c
-  
-  install: uzap
-! 	install -s -m 771 uzap $(BINDIR)
-! 	install -c -m 664 uzap.man $(MANDIR)/uzap.$(MSECT)
-  
-  clean:
-! 	rm -f *.o core uzap
---- 21,28 ----
-  	cc -c -O screen.c
-  
-  install: uzap
-! 	install -s -m 755 -o bin -g bin uzap $(BINDIR)
-! 	install -c -m 644 -o bin -g bin uzap.man $(MANDIR)/uzap.$(MSECT)
-  
-  clean:
-! 	rm -f *.o core *.core uzap
+--- Makefile.orig	Thu Mar 30 10:04:11 1989
++++ Makefile	Sun Oct 19 02:17:28 2003
+@@ -1,26 +1,28 @@
+ # Makefile for Uzap.
+-BINDIR = /usr/local
+-MANDIR = /usr/man/manl
+-MSECT = l
++BINDIR = ${PREFIX}/bin/
++MANDIR = ${PREFIX}/man/man1
++MSECT = 1
++
++all: uzap
+ 
+ uzap: uzap.o edit.o search.o screen.o
+-	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
++	$(CC) $(CFLAGS) uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
+ 
+ uzap.o: uzap.c 
+-	cc -c -O uzap.c  
++	$(CC) -c $(CFLAGS) uzap.c  
+ 
+ edit.o: edit.c
+-	cc -c -O edit.c 
++	$(CC) -c $(CFLAGS) edit.c 
+ 
+ search.o: search.c
+-	cc -c -O search.c
++	$(CC) -c $(CFLAGS) search.c
+ 
+ screen.o: screen.c
+-	cc -c -O screen.c
++	$(CC) -c $(CFLAGS) screen.c
+ 
+ install: uzap
+-	install -s -m 771 uzap $(BINDIR)
+-	install -c -m 664 uzap.man $(MANDIR)/uzap.$(MSECT)
++	install -s -m 755 -o bin -g bin uzap $(BINDIR)
++	install -c -m 644 -o bin -g bin uzap.man $(MANDIR)/uzap.$(MSECT)
+ 
+ clean:
+-	rm -f *.o core uzap
++	rm -f *.o core *.core uzap