%n texinfo %v 3.9 %c * %l * %b * %d * %f * %t texinfo-3.9.tgz %w Gnu %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N texinfo-3.9/Makefile.in texinfo-MCC/Makefile.in --- texinfo-3.9/Makefile.in Fri Oct 4 19:40:33 1996 +++ texinfo-MCC/Makefile.in Mon Oct 14 04:55:04 1996 @@ -56,8 +56,8 @@ manext = 1 mandir = $(prefix)/man/man$(manext) -infodir = $(prefix)/info +infodir = @infodir@ # For info program. -DEFAULT_INFOPATH = $(infodir):. +DEFAULT_INFOPATH = /usr/local/share/info:/opt/info:$(infodir):. #### End of system configuration section. #### @@ -67,5 +67,5 @@ # Subdirectories that have makefiles -SUBDIRS = libtxi makeinfo info util emacs +SUBDIRS = libtxi makeinfo info util # All subdirectories that go into a distribution @@ -80,5 +80,5 @@ all: sub-all texinfo -install: all installdirs +install: all test -f $(infodir)/dir || $(INSTALL_DATA) $(srcdir)/dir $(infodir) for dir in $(SUBDIRS); do \ @@ -86,4 +86,5 @@ (cd $$dir && $(MAKE) $(MDEFINES) $@ || exit 1); \ done +dummy: d=$(srcdir); test -f ./texinfo && d=.; \ (cd $$d && for f in texinfo texinfo-* ; do \ diff -ru2N texinfo-3.9/configure texinfo-MCC/configure --- texinfo-3.9/configure Thu Oct 3 19:46:43 1996 +++ texinfo-MCC/configure Mon Oct 14 04:57:27 1996 @@ -920,5 +920,4 @@ else ac_save_LIBS="$LIBS" -LIBS="-lbsd $LIBS" cat > conftest.$ac_ext < +#include #include #include "terminal.h" @@ -37,5 +38,4 @@ extern char *tgetstr (), *tgoto (); extern char *getenv (); -extern void tputs (); /* Function "hooks". If you make one of these point to a function, that @@ -71,7 +71,4 @@ /* TERMCAP requires these variables, whether we access them or not. */ -char PC; -char *BC, *UP; -short ospeed; /* A buffer which holds onto the current terminal description, and a pointer @@ -109,5 +106,5 @@ static char *term_invend; -static void +static int output_character_function (c) int c; diff -ru2N texinfo-3.9/libtxi/Makefile.in texinfo-MCC/libtxi/Makefile.in --- texinfo-3.9/libtxi/Makefile.in Thu Oct 3 19:32:28 1996 +++ texinfo-MCC/libtxi/Makefile.in Mon Oct 14 05:02:40 1996 @@ -41,5 +41,5 @@ SRCS = getopt.c getopt1.c bzero.c getopt.h -OBJS = getopt.o getopt1.o bzero.o $(ALLOCA) $(LIBOBJS) +OBJS = $(ALLOCA) $(LIBOBJS) PROGS = libtxi.a diff -ru2N texinfo-3.9/makeinfo/Makefile.in texinfo-MCC/makeinfo/Makefile.in --- texinfo-3.9/makeinfo/Makefile.in Tue Oct 1 22:45:00 1996 +++ texinfo-MCC/makeinfo/Makefile.in Mon Oct 14 05:03:33 1996 @@ -84,4 +84,5 @@ install: all $(INSTALL_PROGRAM) makeinfo $(bindir)/$(binprefix)makeinfo +dummy: -d=$(srcdir); test -f ./makeinfo.info && d=.; $(INSTALL_DATA) $$d/makeinfo.info $(infodir)/makeinfo.info $(POST_INSTALL) ENDPATCH env INSTALL_PROGRAM='install -s -m 555' INSTALL_DATA='install -m 444' \ CFLAGS='-O6 -fomit-frame-pointer' LDFLAGS='-Wl,-warn-common' LIBS='' \ ./configure --prefix=/usr --infodir=/usr/share/info make * make install * mv -f /usr/bin/install-info /usr/sbin/install-info %%