--- code/trunk/Makefile.am	2007/03/29 13:56:00	137
+++ code/trunk/Makefile.am	2007/04/02 13:32:07	144
@@ -63,7 +63,7 @@
 # TESTS is for binary unit tests, check_SCRIPTS for script-based tests
 TESTS =
 check_SCRIPTS =
-noinst_SCRIPTS =
+dist_noinst_SCRIPTS =
 
 # Some of the binaries we make are to be installed, and others are
 # (non-user-visible) helper programs needed to build libpcre.
@@ -106,6 +106,12 @@
   pcre.h.generic \
   config.h.generic
 
+pcre.h.generic: configure.ac
+	rm -f $@
+	cp -p pcre.h $@
+
+MAINTAINERCLEANFILES += pcre.h.generic
+
 # These are the header files we'll install. We do not distribute pcre.h because
 # it is generated from pcre.h.in.
 nodist_include_HEADERS = \
@@ -231,14 +237,14 @@
 # ways. We install these test binaries in case folks find it helpful.
 
 TESTS += RunTest
-noinst_SCRIPTS += RunTest
+dist_noinst_SCRIPTS += RunTest
 EXTRA_DIST += RunTest.bat
 bin_PROGRAMS += pcretest
 pcretest_SOURCES = pcretest.c
 pcretest_LDADD = libpcreposix.la
 
 TESTS += RunGrepTest
-noinst_SCRIPTS += RunGrepTest
+dist_noinst_SCRIPTS += RunGrepTest
 bin_PROGRAMS += pcregrep
 pcregrep_SOURCES = pcregrep.c
 pcregrep_LDADD = libpcreposix.la