diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | nasm.spec.in | 2 |
2 files changed, 5 insertions, 5 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 $@ $< diff --git a/nasm.spec.in b/nasm.spec.in index d6102846..317e2d80 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 |