From c6dfff5f1b587c2d1eaf9125338397277afdd8cf Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 28 Nov 1994 20:51:40 +0000
Subject: (prefix, exec_prefix): Set. (CPPFLAGS): Filter out @...@.
 ($(ARCH)/glob/libglob.a): Don't pass down variables.

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

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 2ae4801..c51fb9b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -45,6 +45,8 @@ include compatMakefile
 MAKE = $(MAKE_COMMAND) $(MAKEOVERRIDES)
 
 # Remove autoconf magic.
+prefix = /usr/local
+exec_prefix = $(prefix)
 extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
 LOADLIBES := $(filter-out @%@,$(LOADLIBES))
 ALLOCA := $(filter-out @%@,$(ALLOCA))
@@ -86,7 +88,7 @@ GLOB =
 
 else
 
-CPPFLAGS := $(CPPFLAGS) -Iglob
+CPPFLAGS := $(filter-out @%@,$(CPPFLAGS)) -Iglob
 
 endif	 # works-for-make
 endif	 # $(libc_dir)
@@ -96,9 +98,7 @@ endif	 # !no_libc
 $(ARCH)/%.o: %.c
 	$(COMPILE.c) -Iglob $< $(OUTPUT_OPTION)
 $(ARCH)/glob/libglob.a: FORCE
-	$(MAKE) -C $(@D) $(@F) \
-		CC='$(CC)' CFLAGS='$(CFLAGS) -I..' \
-		CPPFLAGS='$(CPPFLAGS) -DHAVE_CONFIG_H'
+	$(MAKE) -C $(@D) $(@F)
 FORCE:
 objs := $(addprefix $(ARCH)/,$(objs))
 prog := $(ARCH)/make
-- 
cgit v1.2.3