Respect CC and don't try and include a null header directory

This commit is contained in:
Kris Kennaway 2002-06-03 09:48:36 +00:00
parent dc749e9564
commit 058798b389
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=60516

View file

@ -1,5 +1,14 @@
--- Makefile.orig Fri Jun 11 07:09:12 1993
+++ Makefile Fri Apr 30 18:21:35 1999
+++ Makefile Mon Jun 3 02:48:05 2002
@@ -10,7 +10,7 @@
#CC = gcc
#
# standard
-CC = cc
+CC ?= gcc
#####################################
# Optimization flags
@@ -18,7 +18,7 @@
# GNU C
#OPTIMIZE= -fcombine-regs -O
@ -14,7 +23,7 @@
#
#
-CFLAGS = $(DEBUG) $(OPTIMIZE) $(INCLUDEDIR)
+CFLAGS += $(DEBUG) $(OPTIMIZE) -I$(INCLUDEDIR)
+CFLAGS += $(DEBUG) $(OPTIMIZE)
txtmerge:
$(CC) $(CFLAGS) -o txtmerge txtmerge.c