From 467828c43184b6559d6e14bceba8c430af16af5c Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 2 Oct 2025 17:29:35 -0700 Subject: [PATCH] Even more path hacks for the rpm build - append /html if htmldir = docdir - Run autogen.sh with --cleanenv - Actually use PDFZ and not just Z in doc/Makefile.in. Signed-off-by: H. Peter Anvin (Intel) --- doc/Makefile.in | 12 ++++++++---- nasm.spec.in | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in index fa4bd84e..a6128d6e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -147,12 +147,16 @@ spotless: clean -$(RM_F) *.hlp nasmdoc.txt *.inf *.pdf *.pdf.xz *.dvi install_html: html - $(MKDIR_P) $(DESTDIR)$(htmldir) - $(INSTALL_DATA) html/* $(DESTDIR)$(htmldir) + html='$(htmldir)' ; \ + if [ x"$$html" = x'$(docdir)' ]; then \ + html="$$html/html" ; \ + fi ; \ + $(MKDIR_P) $(DESTDIR)"$$html" ; \ + $(INSTALL_DATA) html/* $(DESTDIR)"$$html" -install_pdf: nasmdoc.pdf$(Z) +install_pdf: nasmdoc.pdf$(PDFZ) $(MKDIR_P) $(DESTDIR)$(pdfdir) - $(INSTALL_DATA) nasmdoc.pdf$(Z) $(DESTDIR)$(pdfdir) + $(INSTALL_DATA) nasmdoc.pdf$(PDFZ) $(DESTDIR)$(pdfdir) install: install_html install_pdf diff --git a/nasm.spec.in b/nasm.spec.in index ccad8519..e3ba0031 100644 --- a/nasm.spec.in +++ b/nasm.spec.in @@ -52,7 +52,7 @@ PDF formats. %setup -q -n nasm-%{nasm_version} %build -sh autogen.sh +sh autogen.sh --clearenv %configure --enable-gc $([ -z "%{_lto_cflags}" ] || echo --enable-lto) make %{?_smp_mflags} everything