mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-12-27 23:06:54 +00:00
(prefix, exec_prefix): Set.
(CPPFLAGS): Filter out @...@. ($(ARCH)/glob/libglob.a): Don't pass down variables.
This commit is contained in:
parent
74540a1e91
commit
c6dfff5f1b
1 changed files with 4 additions and 4 deletions
|
@ -45,6 +45,8 @@ include compatMakefile
|
||||||
MAKE = $(MAKE_COMMAND) $(MAKEOVERRIDES)
|
MAKE = $(MAKE_COMMAND) $(MAKEOVERRIDES)
|
||||||
|
|
||||||
# Remove autoconf magic.
|
# Remove autoconf magic.
|
||||||
|
prefix = /usr/local
|
||||||
|
exec_prefix = $(prefix)
|
||||||
extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
|
extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
|
||||||
LOADLIBES := $(filter-out @%@,$(LOADLIBES))
|
LOADLIBES := $(filter-out @%@,$(LOADLIBES))
|
||||||
ALLOCA := $(filter-out @%@,$(ALLOCA))
|
ALLOCA := $(filter-out @%@,$(ALLOCA))
|
||||||
|
@ -86,7 +88,7 @@ GLOB =
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
CPPFLAGS := $(CPPFLAGS) -Iglob
|
CPPFLAGS := $(filter-out @%@,$(CPPFLAGS)) -Iglob
|
||||||
|
|
||||||
endif # works-for-make
|
endif # works-for-make
|
||||||
endif # $(libc_dir)
|
endif # $(libc_dir)
|
||||||
|
@ -96,9 +98,7 @@ endif # !no_libc
|
||||||
$(ARCH)/%.o: %.c
|
$(ARCH)/%.o: %.c
|
||||||
$(COMPILE.c) -Iglob $< $(OUTPUT_OPTION)
|
$(COMPILE.c) -Iglob $< $(OUTPUT_OPTION)
|
||||||
$(ARCH)/glob/libglob.a: FORCE
|
$(ARCH)/glob/libglob.a: FORCE
|
||||||
$(MAKE) -C $(@D) $(@F) \
|
$(MAKE) -C $(@D) $(@F)
|
||||||
CC='$(CC)' CFLAGS='$(CFLAGS) -I..' \
|
|
||||||
CPPFLAGS='$(CPPFLAGS) -DHAVE_CONFIG_H'
|
|
||||||
FORCE:
|
FORCE:
|
||||||
objs := $(addprefix $(ARCH)/,$(objs))
|
objs := $(addprefix $(ARCH)/,$(objs))
|
||||||
prog := $(ARCH)/make
|
prog := $(ARCH)/make
|
||||||
|
|
Loading…
Reference in a new issue