$NetBSD: patch-ag,v 1.3 2002/08/08 11:59:37 wiz Exp $

--- src/resid/Makefile.in.orig	Tue Dec 18 22:44:20 2001
+++ src/resid/Makefile.in
@@ -73,13 +73,13 @@ libresid_a_SOURCES = sid.cc voice.cc wav
 
 BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
 
-pkginclude_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
+noinst_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
 
 noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
 
 noinst_SCRIPTS = samp2src.pl
 
-EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) README.VICE
+EXTRA_DIST = $(noinst_DATA) $(noinst_HEADERS) $(noinst_SCRIPTS) README.VICE
 
 SUFFIXES = .dat
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -110,7 +110,7 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(noinst_DATA)
 
-HEADERS =  $(pkginclude_HEADERS)
+HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS THANKS TODO aclocal.m4 configure configure.in \
@@ -179,21 +181,6 @@ libresid.a: $(libresid_a_OBJECTS) $(libr
 .cc.o:
 	$(CXXCOMPILE) -c $<
 
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
-	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	list='$(pkginclude_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
-	done
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -300,20 +325,19 @@ installcheck: installcheck-am
 install-exec-am:
 install-exec: install-exec-am
 
-install-data-am: install-pkgincludeHEADERS
+install-data-am:
 install-data: install-data-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-pkgincludeHEADERS
+uninstall-am:
 uninstall: uninstall-am
 all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(pkgincludedir)
 
 
 mostlyclean-generic: