$NetBSD: patch-ab,v 1.6 1999/03/05 09:44:20 tron Exp $

--- Makefile.in.orig	Wed Feb 24 23:09:14 1999
+++ Makefile.in	Tue Mar  2 23:50:46 1999
@@ -48,7 +48,7 @@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -91,8 +91,6 @@
 
 SUBDIRS = . gmodule gthread docs tests
 
-configincludedir = $(pkglibdir)/include
-
 bin_SCRIPTS = glib-config
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
@@ -107,13 +105,10 @@
 libglib_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
 
 
-include_HEADERS =  	glib.h
-
-
-configinclude_DATA =  	glibconfig.h
+include_HEADERS =  	glib.h glibconfig.h
 
 
-libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 
 noinst_PROGRAMS = testglib testgdate testgdateparser
@@ -161,7 +156,7 @@
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(configinclude_DATA) $(m4data_DATA)
+DATA =  $(m4data_DATA)
 
 HEADERS =  $(include_HEADERS)
 
@@ -335,25 +330,6 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
 
-install-configincludeDATA: $(configinclude_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(configincludedir)
-	@list='$(configinclude_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-configincludeDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(configinclude_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(configincludedir)/$$p; \
-	done
-
 install-m4dataDATA: $(m4data_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
@@ -551,8 +527,7 @@
 install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
 install-exec: install-exec-recursive
 
-install-data-am: install-configincludeDATA install-m4dataDATA \
-		install-includeHEADERS
+install-data-am: install-m4dataDATA install-includeHEADERS
 install-data: install-data-recursive
 
 install-am: all-am
@@ -625,7 +600,6 @@
 maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
 distclean-noinstPROGRAMS clean-noinstPROGRAMS \
 maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
-uninstall-configincludeDATA install-configincludeDATA \
 uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
 install-includeHEADERS install-data-recursive uninstall-data-recursive \
 install-exec-recursive uninstall-exec-recursive installdirs-recursive \