diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2017-07-06 01:36:06 +0300 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2017-07-06 01:36:06 +0300 |
| commit | 20d9c86eb1e088efe0093b31f6fb0952971566f1 (patch) | |
| tree | 99f18d64eeef603cdeb46065335c25a637ff3259 /Makefile.in | |
| parent | a4f6ca5a33d75407bff56f7e65bb8a6bbfd4bf1d (diff) | |
| download | nasm-20d9c86eb1e088efe0093b31f6fb0952971566f1.tar.gz | |
build: Merge CPPFLAGS into ALL_CFLAGS
This is a fix for a4f6ca5a33d
- We should not use sole CPPFLAGS when compiling,
but rather merge it into ALL_CFLAGS
- nasm.spec.in should use DESTDIR since
INSTALLROOT now renamed to it
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index e7f01e4e..5024974c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,7 @@ datarootdir = @datarootdir@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ -BUILD_CFLAGS = $(CFLAGS) @DEFS@ +BUILD_CFLAGS = $(CPPFLAGS) $(CFLAGS) @DEFS@ INTERNAL_CFLAGS = -I$(srcdir) -I$(objdir) \ -I$(srcdir)/include -I$(objdir)/include \ -I$(srcdir)/x86 -I$(objdir)/x86 \ @@ -73,13 +73,13 @@ endif .PHONY: manpages nsis .c.$(O): - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< + $(CC) -c $(ALL_CFLAGS) $(ALL_CFLAGS) -o $@ $< .c.s: - $(CC) -S $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< + $(CC) -S $(ALL_CFLAGS) $(ALL_CFLAGS) -o $@ $< .c.i: - $(CC) -E $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< + $(CC) -E $(ALL_CFLAGS) $(ALL_CFLAGS) -o $@ $< .txt.xml: $(ASCIIDOC) -b docbook -d manpage -o $@ $< |