Convert to USE_NEW_TEXINFO.

This commit is contained in:
seb 2003-06-23 21:13:10 +00:00
parent 70b2baae6a
commit f6e6933bb2
4 changed files with 12 additions and 15 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2003/06/02 01:20:37 jschauma Exp $ # $NetBSD: Makefile,v 1.10 2003/06/23 21:13:10 seb Exp $
# #
DISTNAME= nasm-0.98.36 DISTNAME= nasm-0.98.36
@ -14,12 +14,11 @@ INSTALL_TARGET= install_everything
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_PERL5= build USE_PERL5= build
USE_NEW_TEXINFO= YES
USE_MAKEINFO= YES
INFO_FILES= nasm.info INFO_FILES= nasm.info
TEXINFO_OVERRIDE= YES
TEXINFO_PATTERNS+= Makefile
MAKE_ENV+= PERL5="${PERL5}" \ MAKE_ENV+= PERL5="${PERL5}" \
INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2003/01/13 23:31:11 salo Exp $ @comment $NetBSD: PLIST,v 1.4 2003/06/23 21:13:10 seb Exp $
bin/nasm bin/nasm
bin/ndisasm bin/ndisasm
bin/rdfdump bin/rdfdump
@ -10,7 +10,6 @@ bin/rdf2ihx
bin/rdf2com bin/rdf2com
man/man1/nasm.1 man/man1/nasm.1
man/man1/ndisasm.1 man/man1/ndisasm.1
@unexec ${INSTALL_INFO} --delete %D/info/nasm.info %D/info/dir
info/nasm.info info/nasm.info
info/nasm.info-1 info/nasm.info-1
info/nasm.info-2 info/nasm.info-2
@ -26,7 +25,6 @@ info/nasm.info-11
info/nasm.info-12 info/nasm.info-12
info/nasm.info-13 info/nasm.info-13
info/nasm.info-14 info/nasm.info-14
@exec ${INSTALL_INFO} %D/info/nasm.info %D/info/dir
share/doc/html/nasm/nasmdoc0.html share/doc/html/nasm/nasmdoc0.html
share/doc/html/nasm/nasmdoc1.html share/doc/html/nasm/nasmdoc1.html
share/doc/html/nasm/nasmdoc2.html share/doc/html/nasm/nasmdoc2.html

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.3 2003/03/15 16:15:12 wiz Exp $ $NetBSD: distinfo,v 1.4 2003/06/23 21:13:11 seb Exp $
SHA1 (nasm-0.98.36.tar.gz) = 19b8920f7c26b5a9d6cfcfbc7cfc95f68afc8ac0 SHA1 (nasm-0.98.36.tar.gz) = 19b8920f7c26b5a9d6cfcfbc7cfc95f68afc8ac0
Size (nasm-0.98.36.tar.gz) = 624085 bytes Size (nasm-0.98.36.tar.gz) = 624085 bytes
SHA1 (patch-aa) = 05a3d32e4b1be539a595c79cdcd8b9390d50ab65 SHA1 (patch-aa) = 05a3d32e4b1be539a595c79cdcd8b9390d50ab65
SHA1 (patch-ab) = 34979432b33dcde42441cbfd26a534270e91e555 SHA1 (patch-ab) = bbe1d7219dd2e5ade8f97a4f3070bc87d3a7d4b5

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.2 2003/01/13 23:31:12 salo Exp $ $NetBSD: patch-ab,v 1.3 2003/06/23 21:13:12 seb Exp $
--- doc/Makefile.in.orig Sun May 19 00:17:28 2002 --- doc/Makefile.in.orig 2002-05-18 22:17:28.000000000 +0000
+++ doc/Makefile.in Mon Jan 13 23:51:53 2003 +++ doc/Makefile.in
@@ -9,20 +9,21 @@ @@ -9,20 +9,20 @@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
mandir = @mandir@ mandir = @mandir@
@ -16,8 +16,8 @@ $NetBSD: patch-ab,v 1.2 2003/01/13 23:31:12 salo Exp $
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
-PERL = perl -PERL = perl
-MAKEINFO = makeinfo
+PERL = ${PERL5} +PERL = ${PERL5}
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi TEXI2DVI = texi2dvi
PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript
@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.2 2003/01/13 23:31:12 salo Exp $
all: $(OUT) all: $(OUT)
@@ -73,6 +74,7 @@ @@ -73,6 +73,7 @@ spotless: clean
install: all install: all
$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)