diff options
| author | Roland McGrath <roland@redhat.com> | 1994-11-28 20:51:40 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 1994-11-28 20:51:40 +0000 |
| commit | c6dfff5f1b587c2d1eaf9125338397277afdd8cf (patch) | |
| tree | 797cd137cd24e2341bb362aba0ea36c034f320b8 | |
| parent | 74540a1e91c490c34e12248da4e85dec0c1766ed (diff) | |
| download | gunmake-c6dfff5f1b587c2d1eaf9125338397277afdd8cf.tar.gz | |
(prefix, exec_prefix): Set.
(CPPFLAGS): Filter out @...@.
($(ARCH)/glob/libglob.a): Don't pass down variables.
| -rw-r--r-- | GNUmakefile | 8 |
1 files changed, 4 insertions, 4 deletions
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 |