From: etheisen <etheisen@openbsd.org>
Date: Fri, 2 Feb 1996 06:34:09 +0000 (+0000)
Subject: Added default info path to match our directory structure.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=becf174becc214fd6c860a733d7b9b05a5d55a5c;p=openbsd

Added default info path to match our directory structure.
Pass CFLAGS into 'configure' generated Makefile.
Setup infodir for both build and install.
Removed static linking.  Not required for texinfo.
Added CLEANFILES section to smash files cleandir missed.
---

diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
index 910fa55d7a3..fac88839d9f 100644
--- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
@@ -1,11 +1,16 @@
-#	$Id: Makefile.bsd-wrapper,v 1.4 1996/02/02 00:49:14 niklas Exp $
+#	$Id: Makefile.bsd-wrapper,v 1.5 1996/02/02 06:34:09 etheisen Exp $
+
+INFODIR=	infodir=${DESTDIR}/usr/share/info
+INFOPATH=	DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:.
+CLEANFILES=	makeinfo/makeinfo.info info/info info/info-stnd.info
 
 MAN=		info/info.1
 SUBDIRS=	libtxi makeinfo info util
-FSFMAKE=	${MAKE} SUBDIRS="$(SUBDIRS)"
+GNUCFLAGS=	CFLAGS="$(CFLAGS)"
+FSFMAKE=	${MAKE} SUBDIRS="$(SUBDIRS)" $(GNUCFLAGS) $(INFODIR) $(INFOPATH)
 
 all:	config.status
-	${FSFMAKE} LDFLAGS=${LDSTATIC}
+	${FSFMAKE} 
 
 .FORCE:	.IGNORE
 
@@ -18,9 +23,10 @@ config.status:
 
 install:	maninstall
 	${FSFMAKE} prefix=${DESTDIR}/usr bindir=${DESTDIR}/usr/bin \
-	infodir=${DESTDIR}/usr/share/info mandir= INSTALL_MAN= install
+	mandir= INSTALL_MAN= install
 
 clean cleandir:
+	rm -f $(CLEANFILES)
 	-@if [ -e Makefile ]; then ${FSFMAKE} distclean; fi
 
 depend: