From a301f9327a0fd309e659445846325a74ccb08e72 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Thu, 27 Aug 1992 23:25:59 +0000
Subject: [PATCH] Formerly GNUmakefile.~78~

---
 GNUmakefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 41531fb3..49cdd5c0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -55,9 +55,7 @@ $(archpfx)remote.o: remote.c
 $(archpfx)remote.dep: remote.c
 	$(mkdep) $(REMOTE) $< | sed 's,$*\.o,& $@,' > $@
 
-ifneq "$(defines)" "@DEFS@"
-CPPFLAGS = $(defines)
-endif
+CPPFLAGS := $(filter-out @%@,$(defines))
 
 ifneq "$(wildcard $(ARCH)/makefile)" ""
 include $(ARCH)/makefile
@@ -79,9 +77,10 @@ CC := $(CC) -b glibc
 
 # getopt is in libc.
 GETOPT =
-GETOPT_SRC =
+#GETOPT_SRC = Don't clear this or dist will break.
 
-CPPFLAGS := -DSTDC_HEADERS -DHAVE_UNISTD_H -DHAVE_GLOB_H \
+CPPFLAGS := $(CPPFLAGS) \
+	    -DSTDC_HEADERS -DHAVE_UNISTD_H -DHAVE_GLOB_H \
 	    -DHAVE_GETDTABLESIZE -DHAVE_SYS_SIGLIST -DHAVE_DUP2 \
 	    -DHAVE_GETCWD -DHAVE_SIGSETMASK -DHAVE_GETGROUPS -DHAVE_SETLINEBUF