Don't build or install compiled elisp files or unformatted manpages.

However formatted ones shall be installed.  Fix typo.

3 files changed, 48 insertions, 4 deletions

diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
new file mode 100644
index 00000000000..c763ec0cda3
--- /dev/null
+++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
@@ -0,0 +1,36 @@
+#	$Id: Makefile.bsd-wrapper,v 1.1 1995/12/22 18:12:36 niklas Exp $
+
+MAN=		info/info.1
+SUBDIRS=	libtxi makeinfo info util
+FSFMAKE=	${MAKE} SUBDIRS="$(SUBDIRS)"
+
+all:	config.status
+	${FSFMAKE}
+
+.FORCE:	.IGNORE
+
+config: .FORCE
+	/bin/sh ${.CURDIR}/configure --prefix=/usr
+
+config.status:
+	/bin/sh ${.CURDIR}/configure --prefix=/usr
+
+install:	maninstall
+	${FSFMAKE} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
+		   mandir= INSTALL_MAN= install
+
+clean cleandir:
+	-@if [ -e Makefile ]; then ${FSFMAKE} distclean; fi
+
+depend:
+	# Nothing here so far...
+
+lint:
+	# Nothing here so far...
+
+tags:
+	# Nothing here so far...
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
+.include <bsd.man.mk>
diff --git a/gnu/usr.bin/texinfo/Makefile.in b/gnu/usr.bin/texinfo/Makefile.in
index fd648031d81..b19ba6381a9 100644
--- a/gnu/usr.bin/texinfo/Makefile.in
+++ b/gnu/usr.bin/texinfo/Makefile.in
@@ -74,7 +74,7 @@ MDEFINES = bindir='$(bindir)' mandir='$(mandir)' manext='$(manext)' \
 	prefix='$(prefix)' binprefix='$(binprefix)' \
 	manprefix='$(manprefix)' infodir='$(infodir)' CFLAGS='$(CFLAGS)' \
 	CC='$(CC)' ALLOCA='$(ALLOCA)' LDFLAGS='$(LDFLAGS)' \
-	DEFAULT_INFOPATH='$(DEFAULT_INFOPATH)'
+	DEFAULT_INFOPATH='$(DEFAULT_INFOPATH)' INSTALL_MAN='$(INSTALL_MAN)'
 
 all: sub-all texinfo
 
@@ -133,9 +133,11 @@ texclean:
 
 realclean: distclean
 
-texinfo: sub-all
+texinfo: makeinfo/makeinfo texinfo.texi
 	./makeinfo/makeinfo -I$(srcdir) texinfo.texi
 
+makeinfo/makeinfo: sub-all
+
 texinfo.dvi:
 	PATH="$(srcdir)/util:$${PATH}" TEXINPUTS="$(srcdir):$(common):$${TEXINPUTS}" texi2dvi $(srcdir)/texinfo.texi
 
diff --git a/gnu/usr.bin/texinfo/info/Makefile.in b/gnu/usr.bin/texinfo/info/Makefile.in
index bccfd820658..d26363e5130 100644
--- a/gnu/usr.bin/texinfo/info/Makefile.in
+++ b/gnu/usr.bin/texinfo/info/Makefile.in
@@ -62,6 +62,10 @@ manext = 1
 infodir = $(prefix)/info
 DEFAULT_INFOPATH= $(infodir):.
 
+# Some systems don't want unformatted pages installed, set this var to
+# nothing and you'll get that behaviour
+INSTALL_MAN = install-man
+
 #### End of system configuration section. ####
 
 SRCS =	dir.c		display.c	echo_area.c	filesys.c \
@@ -99,10 +103,12 @@ MAKEDOC_SOURCE = makedoc.c clib.c xmalloc.c
 all: info info.info info-stnd.info
 sub-all: all
 
-install: all
+install: all $(INSTALL_MAN)
 	$(INSTALL_PROGRAM) info $(bindir)/$(binprefix)info
 	-d=$(srcdir); test -f ./info.info && d=.; $(INSTALL_DATA) $$d/info.info $(infodir)/info.info
 	-d=$(srcdir); test -f ./info-stnd.info && d=.; $(INSTALL_DATA) $$d/info-stnd.info $(infodir)/info-stnd.info
+
+install-man:
 	-$(INSTALL_DATA) $(srcdir)/info.1 $(mandir)/info.$(manext)
 
 uninstall:
@@ -213,7 +219,7 @@ session.o: 	info.h
 signals.o: 	info.h signals.h
 terminal.o: 	terminal.h termdep.h
 tilde.o: 	tilde.h
-variables.c: 	variables.h
+variables.o: 	variables.h
 window.o: 	nodes.h window.h display.h
 window.o: 	info-utils.h search.h infomap.h