OpenBSD customization. As we have DESTDIR as a maketime configuration option,

infodir and friends must be passed down dynamically to subdir makes.
Also did some style nits in the wrapper for consistency.

2 files changed, 41 insertions, 11 deletions

diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
index 7810c8d2a1b..359385f2dc9 100644
--- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
@@ -1,13 +1,15 @@
-#	$Id: Makefile.bsd-wrapper,v 1.20 1997/08/01 22:48:18 kstailey Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.21 1997/08/06 10:22:13 niklas Exp $
 
 INFODIR=	infodir=${DESTDIR}/usr/share/info
 INFOPATH=	DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:.
-CLEANFILES=	makeinfo/makeinfo.info info/info.info info/info-stnd.info emacs/Makefile
+CLEANFILES=	makeinfo/makeinfo.info info/info.info info/info-stnd.info \
+		emacs/Makefile
 
 NOMAN=		# info.1 manpage passed into obsolescence
 SUBDIRS=	intl lib info makeinfo po util doc
-GNUCFLAGS=	CFLAGS="$(CFLAGS)"
-FSFMAKE=	${MAKE} SUBDIRS="$(SUBDIRS)" $(GNUCFLAGS) $(INFODIR) $(INFOPATH)
+GNUCFLAGS=	CFLAGS="${CFLAGS}"
+FSFMAKE=	${MAKE} SUBDIRS="${SUBDIRS}" ${GNUCFLAGS} ${INFODIR} \
+			${INFOPATH}
 
 .include <bsd.own.mk>
 
@@ -27,11 +29,11 @@ config: .FORCE
 	-rm -f config.cache
 .endif
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-		/bin/sh ${.CURDIR}/configure --prefix=/usr $(CF)
+		/bin/sh ${.CURDIR}/configure --prefix=/usr ${CF}
 
 config.status:
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-		/bin/sh ${.CURDIR}/configure --prefix=/usr $(CF)
+		/bin/sh ${.CURDIR}/configure --prefix=/usr ${CF}
 
 .ifdef NOMAN
 maninstall:
@@ -45,7 +47,7 @@ install:	maninstall
 	    ${DESTDIR}/usr/share/info/dir
 
 clean cleandir:
-	rm -f $(CLEANFILES)
+	rm -f ${CLEANFILES}
 	-@if [ -e Makefile ]; then ${FSFMAKE} distclean; fi
 
 depend:
diff --git a/gnu/usr.bin/texinfo/Makefile.in b/gnu/usr.bin/texinfo/Makefile.in
index 1ffda65da64..239d0229e0b 100644
--- a/gnu/usr.bin/texinfo/Makefile.in
+++ b/gnu/usr.bin/texinfo/Makefile.in
@@ -87,6 +87,34 @@ EXTRA_DIST = INTRODUCTION dir-example README-alpha
 # Do doc/ last so makeinfo will be built when we get there.
 # Others are alphabetical.
 SUBDIRS = intl lib emacs info makeinfo po util doc
+
+# XXX OpenBSD customizations
+# We need this as we have different installpaths depending on the
+# DESTDIR environment variable.  That means that the configure flags
+# like --infodir cannot be used.
+
+# Setup environment for subdir make invocations, right now only used
+# Flags to pass to recursive makes.
+# CC is set by configure.
+# ??? The choices here will need some experimenting with.
+FLAGS_TO_PASS = \
+	"exec_prefix=$(exec_prefix)" \
+	"prefix=$(prefix)" \
+	"bindir=$(bindir)" \
+	"sbindir=$(sbindir)" \
+	"libexecdir=$(libexecdir)" \
+	"datadir=$(datadir)" \
+	"sysconfdir=$(sysconfdir)" \
+	"sharedstatedir=$(sharedstatedir)" \
+	"localstatedir=$(localstatedir)" \
+	"libdir=$(libdir)" \
+	"infodir=$(infodir)" \
+	"mandir=$(mandir)" \
+	"includedir=$(includedir)" \
+	"oldincludedir=$(oldincludedir)"
+
+SUBDIRMAKE = $(MAKE) $(FLAGS_TO_PASS)
+# XXX end of OpenBSD customization
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -155,7 +183,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 	for subdir in $(SUBDIRS); do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(SUBDIRMAKE) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
@@ -166,12 +194,12 @@ maintainer-clean-recursive:
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(SUBDIRMAKE) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
+	  (cd $$subdir && $(SUBDIRMAKE) tags); \
 	done
 
 tags: TAGS
@@ -244,7 +272,7 @@ distdir: $(DISTFILES)
 	  || mkdir $(distdir)/$$subdir		\
 	  || exit 1;				\
 	  chmod 777 $(distdir)/$$subdir;	\
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  (cd $$subdir && $(SUBDIRMAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
 info: info-recursive