From 058798b389fffedf447f6bb76217eaedbe5349ab Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Mon, 3 Jun 2002 09:48:36 +0000 Subject: [PATCH] Respect CC and don't try and include a null header directory --- graphics/txtmerge/files/patch-aa | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/graphics/txtmerge/files/patch-aa b/graphics/txtmerge/files/patch-aa index c4f1ed486ff7..2bdbb088d987 100644 --- a/graphics/txtmerge/files/patch-aa +++ b/graphics/txtmerge/files/patch-aa @@ -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