mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-02-17 17:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Merge CPPFLAGS into ALL_CFLAGS

Browse Source 
This is a fix for a4f6ca5a33

 - 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>
This commit is contained in:
Cyrill Gorcunov 2017-07-06 01:36:06 +03:00
parent a4f6ca5a33
commit 20d9c86eb1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -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 $@ $<

2
nasm.spec.in
View File

@ -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