From 80bac20ce7b664f7f3bac369f99062406ef28432 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Fri, 10 Mar 2000 17:44:15 +0000
Subject: [PATCH] fix stupid automake code for producing info pages so it'll
 work when using SEPARATE_BUILD

---
 devel/glib/Makefile         |  3 +-
 devel/glib/patches/patch-ad | 77 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 01bbeee1a3c..4fc0f38a139 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2000/03/10 07:45:14 brad Exp $
+# $OpenBSD: Makefile,v 1.24 2000/03/10 17:44:15 brad Exp $
 
 DISTNAME=	glib-1.2.7
 CATEGORIES=	devel
@@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 FAKE=	Yes
 
+SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --disable-threads \
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index 4eac2b3f64e..9563528dd7c 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,5 +1,5 @@
 --- docs/Makefile.in.orig	Wed Feb 16 06:19:15 2000
-+++ docs/Makefile.in	Tue Mar  7 16:28:56 2000
++++ docs/Makefile.in	Thu Mar  9 11:18:47 2000
 @@ -85,7 +85,7 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
@@ -9,3 +9,78 @@
  OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
+@@ -135,46 +135,40 @@
+ DVIPS = dvips
+ 
+ .texi.info:
+-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+-	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
++	$(MAKEINFO) -I $(srcdir) $<
+ 
+ .texi.dvi:
+ 	TEXINPUTS=.:$$TEXINPUTS \
+ 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+ 
+ .texi:
+-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+-	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
++	$(MAKEINFO) -I $(srcdir) $<
+ 
+ .texinfo.info:
+-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+-	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
++	$(MAKEINFO) -I $(srcdir) $<
+ 
+ .texinfo:
+-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+-	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
++	$(MAKEINFO) -I $(srcdir) $<
+ 
+ .texinfo.dvi:
+ 	TEXINPUTS=.:$$TEXINPUTS \
+ 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+ 
+ .txi.info:
+-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+-	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
++	$(MAKEINFO) -I $(srcdir) $<
+ 
+ .txi.dvi:
+ 	TEXINPUTS=.:$$TEXINPUTS \
+ 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+ 
+ .txi:
+-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+-	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
++	$(MAKEINFO) -I $(srcdir) $<
+ .dvi.ps:
+ 	$(DVIPS) $< -o $@
+ 
+@@ -183,11 +177,10 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(infodir)
+ 	@list='$(INFO_DEPS)'; \
+ 	for file in $$list; do \
+-	  d=$(srcdir); \
+-	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+-	    if test -f $$d/$$ifile; then \
+-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
++	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
++	    if test -f $$ifile; then \
++	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile"; \
++	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile; \
+ 	    else : ; fi; \
+ 	  done; \
+ 	done