Merge pull request #231 from tomponline/5.0-edge

nasm: Update manpages patch (5.0-edge)
canonical · Dec 5, 2023 · b55dd90 · b55dd90
2 parents d031da2 + 31bac43
commit b55dd90
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/patches/nasm-0000-disable-manpages.patch b/patches/nasm-0000-disable-manpages.patch
@@ -1,11 +1,11 @@
 diff --git a/Makefile.in b/Makefile.in
-index baca4396..0e739217 100644
+index 860d4d26..a6337256 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -389,9 +389,6 @@ install: nasm$(X) ndisasm$(X)
+@@ -365,9 +365,6 @@ manpages: nasm.1 ndisasm.1
+ install: $(PROGS)
  	$(MKDIR_P) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X)
- 	$(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X)
+ 	$(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)/
 -	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
 -	$(INSTALL_DATA) $(srcdir)/nasm.1 $(DESTDIR)$(mandir)/man1/nasm.1
 -	$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(DESTDIR)$(mandir)/man1/ndisasm.1