[nasm:master] build: Merge CPPFLAGS into ALL_CFLAGS

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  20d9c86eb1e088efe0093b31f6fb0952971566f1
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=20d9c86eb1e088efe0093b31f6fb0952971566f1
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Thu, 6 Jul 2017 01:36:06 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Thu, 6 Jul 2017 01:36:06 +0300

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 <gor...@gm...>


---
 Makefile.in  | 8 ++++----
 nasm.spec.in | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e7f01e4..5024974 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 $@ $<
diff --git a/nasm.spec.in b/nasm.spec.in
index d610284..317e2d8 100644
--- a/nasm.spec.in
+++ b/nasm.spec.in
@@ -54,7 +54,7 @@ xz -9ef doc/nasmdoc.pdf
 rm -rf "%{buildroot}"
 mkdir -p "%{buildroot}"/%{_bindir}
 mkdir -p "%{buildroot}"/%{_mandir}/man1
-make INSTALLROOT="%{buildroot}" install install_rdf
+make DESTDIR="%{buildroot}" install install_rdf
 
 %files
 %doc AUTHORS CHANGES README TODO