Now that @info transparently picks up all .info-* files, don't go through

extra steps to rebuild with --no-split.
This commit is contained in:
naddy 2005-01-27 02:09:52 +00:00
parent fcb96eb5c0
commit 4ea670fd4b
11 changed files with 21 additions and 138 deletions

View File

@ -1,28 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2004/04/10 20:28:00 naddy Exp $
--- doc/Makefile.in.orig 1995-11-25 03:44:35.000000000 +0100
+++ doc/Makefile.in 2004-04-10 22:21:45.000000000 +0200
@@ -26,7 +26,7 @@ VPATH = @srcdir@
transform = @program_transform_name@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
TOUCH = echo timestamp >
@@ -52,9 +52,11 @@ default: all
all info check: sharutils.info remsync.info
sharutils.info: sharutils.texi version.texi
+ @rm -f $(srcdir)/sharutils.info*
cd $(srcdir) && $(MAKEINFO) sharutils.texi
remsync.info: remsync.texi version.texi
+ @rm -f $(srcdir)/remsync.info*
cd $(srcdir) && $(MAKEINFO) remsync.texi
dvi: sharutils.dvi remsync.dvi
@@ -79,7 +81,7 @@ stamp-vti: sharutils.texi $(top_srcdir)/
$OpenBSD: patch-doc_Makefile_in,v 1.3 2005/01/27 02:09:52 naddy Exp $
--- doc/Makefile.in.orig Sat Nov 25 03:44:35 1995
+++ doc/Makefile.in Thu Jan 27 02:27:36 2005
@@ -79,7 +79,7 @@ stamp-vti: sharutils.texi $(top_srcdir)/
$(TOUCH) $(srcdir)/stamp-vti
install install-exec install-data: all

View File

@ -1,13 +1,7 @@
--- Makefile.in.orig Mon Nov 4 12:33:43 2002
+++ Makefile.in Mon Nov 4 12:35:36 2002
@@ -18,13 +18,13 @@ INSTALL_DATA = @INSTALL_DATA@
BINOWN = bin
BINGRP = bin
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
$OpenBSD: patch-Makefile_in,v 1.3 2005/01/27 02:09:52 naddy Exp $
--- Makefile.in.orig Tue Oct 8 18:09:12 2002
+++ Makefile.in Thu Jan 27 02:32:30 2005
@@ -24,7 +24,7 @@ TEXI2DVI = texi2dvi
DEFS =
# Where the system [n]dbm routines are...
@ -25,11 +19,3 @@
progs: $(PROGS)
@@ -206,6 +206,7 @@ TAGS: $(SRCS)
info: gdbm.info
gdbm.info: gdbm.texinfo
+ @rm -f gdbm.info*
$(MAKEINFO) $(srcdir)/gdbm.texinfo
dvi: gdbm.dvi

View File

@ -1,15 +1,6 @@
$OpenBSD: patch-libIDL_Makefile_in,v 1.2 2002/02/24 22:43:59 brad Exp $
$OpenBSD: patch-libIDL_Makefile_in,v 1.3 2005/01/27 02:09:52 naddy Exp $
--- libIDL/Makefile.in.orig Mon Jan 7 04:23:50 2002
+++ libIDL/Makefile.in Sun Feb 24 16:56:17 2002
@@ -90,7 +90,7 @@ LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -121,7 +121,7 @@ BUILT_SOURCES = lexer.c parser.c parser.
libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2004/11/23 11:22:01 espie Exp $
# $OpenBSD: Makefile,v 1.35 2005/01/27 02:09:52 naddy Exp $
COMMENT= "GNU gettext"
@ -27,8 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/intl/.libs -L${LOCALBASE}/lib"
EXTRA_LOCALES=bg en eo fi he hu hr lv nb ro sk uk zh_CN zh_TW
post-extract:
@rm -f ${WRKSRC}/doc/gettext.info*
post-install:
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \

View File

@ -1,3 +1,4 @@
$OpenBSD: patch-doc_Makefile_in,v 1.6 2005/01/27 02:09:52 naddy Exp $
--- doc/Makefile.in.orig Tue Jul 24 10:27:41 2001
+++ doc/Makefile.in Mon Aug 27 11:23:33 2001
@@ -99,7 +99,7 @@ YACC = @YACC@
@ -9,12 +10,3 @@
dvidir = $(docdir)
psdir = $(docdir)
pdfdir = $(docdir)
@@ -110,7 +110,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
SED = sed
RM = rm -f
-MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
+MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ --no-split
info_TEXINFOS = gettext.texi
gettext_TEXINFOS = iso-639.texi iso-3166.texi

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/07/10 23:55:17 brad Exp $
--- doc/Makefile.in.orig Sat Nov 5 15:52:26 1994
+++ doc/Makefile.in Tue Jul 10 19:50:51 2001
@@ -40,7 +40,7 @@ all: m4.info
info: m4.info
m4.info: m4.texinfo version.texi
- cd $(srcdir) && $(MAKEINFO) m4.texinfo
+ cd $(srcdir) && rm -f m4.info* && $(MAKEINFO) --no-split m4.texinfo
dvi: m4.dvi

View File

@ -1,13 +1,7 @@
$OpenBSD: patch-doc_Makefile.in,v 1.2 2002/11/21 17:38:39 naddy Exp $
$OpenBSD: patch-doc_Makefile.in,v 1.3 2005/01/27 02:09:52 naddy Exp $
--- doc/Makefile.in.orig Sun May 19 00:17:28 2002
+++ doc/Makefile.in Thu Nov 21 18:23:44 2002
@@ -17,12 +17,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
PERL = perl
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
+++ doc/Makefile.in Thu Jan 27 02:41:55 2005
@@ -22,7 +22,7 @@ TEXI2DVI = texi2dvi
PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript
SRCS = nasmdoc.src
@ -25,17 +19,15 @@ $OpenBSD: patch-doc_Makefile.in,v 1.2 2002/11/21 17:38:39 naddy Exp $
mv -f *.html html
nasmdoc.texi: nasmdoc.dip
@@ -48,8 +48,8 @@ nasm.info: info/nasm.info
@@ -48,7 +48,7 @@ nasm.info: info/nasm.info
info/nasm.info: nasmdoc.texi
mkdir -p info
- $(MAKEINFO) $<
- mv -f *.info *.info-* info
+ $(MAKEINFO) $?
+ mv -f *.info info
mv -f *.info *.info-* info
# DVI output from texinfo (optional)
nasmdoc.dvi: nasmdoc.texi
@@ -57,10 +57,10 @@ nasmdoc.dvi: nasmdoc.texi
# Rules for building an OS/2 book

View File

@ -1,11 +0,0 @@
--- Makedefs.in.orig Thu Nov 16 06:06:43 2000
+++ Makedefs.in Sun Feb 4 10:37:59 2001
@@ -65,7 +65,7 @@ INSTALL_DATA=@INSTALL_DATA@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
INSTALL_SCRIPT=@INSTALL_SCRIPT@
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
MAKEINFOFLAGS =
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2004/12/22 11:50:29 alek Exp $
# $OpenBSD: Makefile,v 1.55 2005/01/27 02:09:52 naddy Exp $
COMMENT= "multi-screen window manager"
@ -38,9 +38,6 @@ PATCH_LIST= patch-* shmpatch-*
ALL_TARGET= screen screen.info
post-extract:
@rm -f ${WRKSRC}/doc/screen.info*
pre-build:
@perl -pi -e s#!!sysconfdir!!#${SYSCONFDIR}#g ${WRKSRC}/doc/screen.1

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2003/09/26 23:50:55 brad Exp $
--- doc/Makefile.in.orig 2003-09-08 10:47:31.000000000 -0400
+++ doc/Makefile.in 2003-09-13 04:18:35.000000000 -0400
@@ -11,7 +11,7 @@ infodir = @infodir@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf

View File

@ -1,24 +1,7 @@
$OpenBSD: patch-Doc_Makefile_in,v 1.1 2004/07/12 19:46:52 lebel Exp $
--- Doc/Makefile.in.orig Thu Feb 13 06:06:46 2003
+++ Doc/Makefile.in Thu May 22 10:01:03 2003
@@ -37,7 +37,7 @@ INSTALL = @INSTALL@
@DEFS_MK@
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips
TEXI2HTML = texi2html -expand info -split chapter
@@ -99,6 +99,7 @@ info: zsh.info
.PHONY: info
zsh.info: $(sdir)/zsh.texi
+ @rm -f zsh.info*
$(MAKEINFO) $(sdir)/zsh.texi
.yo.1:
@@ -245,11 +246,11 @@ Zsh/manmodmenu.yo: $(MODDOCSRC)
$OpenBSD: patch-Doc_Makefile_in,v 1.2 2005/01/27 02:09:52 naddy Exp $
--- Doc/Makefile.in.orig Fri Aug 13 12:22:29 2004
+++ Doc/Makefile.in Thu Jan 27 02:59:10 2005
@@ -247,11 +247,11 @@ Zsh/manmodmenu.yo: $(MODDOCSRC)
# ========== DEPENDENCIES FOR INSTALLING ==========
# install just installs the manual pages