summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1992-08-27 23:25:59 +0000
committerRoland McGrath <roland@redhat.com>1992-08-27 23:25:59 +0000
commita301f9327a0fd309e659445846325a74ccb08e72 (patch)
tree3354012fcf7ded0e3df333ae94a1d68be2090e3d
parent602d1e18af9c2ba03219c84a2cb3dedc5d3b6887 (diff)
downloadgunmake-a301f9327a0fd309e659445846325a74ccb08e72.tar.gz
Formerly GNUmakefile.~78~
-rw-r--r--GNUmakefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 41531fb..49cdd5c 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