Distcheck might run now, maybe ...

Makefile.am

@@ -3,7 +3,8 @@ SUBDIRS = gnu-compat alberta_util alberta add_ons
 ACLOCAL_AMFLAGS  = -I m4
 
 EXTRA_DIST = gen-assemble-fcts.sh mkdoffreemasks.sh\
- Makefile.am.template generate-alberta-automakefiles.sh
+ Makefile.am.template generate-alberta-automakefiles.sh\
+ install-pkgheader.sh
 
 #
 # install the libtool-script in the libexecdir s.t. Makefile.alberta

configure.ac

@@ -96,20 +96,6 @@ else
 fi],
 [BITS=$(( ${ac_cv_sizeof_long} * 8 ))])
 
-AC_CONFIG_COMMANDS([packageheaders],
-[${RM} -r include
-for m in `find . -name Makefile`
-do
-	AS_IF(
-	   [${FGREP} -q nodist_pkginclude_HEADERS ${m}],
-	      [d=`AS_DIRNAME(["${m}"])`
-	      ${MAKE-make} -C "${d}" INSTALL_HEADER="${ac_top_srcdir}/install-pkgheader.sh" includedir="${ac_abs_top_builddir}/include" install-nodist_pkgincludeHEADERS],
-	   [${FGREP} -q pkginclude_HEADERS ${m}],
-	      [d=`AS_DIRNAME(["${m}"])`
-	      ${MAKE-make} -C "${d}" INSTALL_HEADER="${ac_top_srcdir}/install-pkgheader.sh" includedir="${ac_abs_top_builddir}/include" install-pkgincludeHEADERS],
-           [])
-done])
-
 # Collect the demo programs
 DEMOSOURCES=
 escsrcdir="`echo ${srcdir}|sed -e 's|\.|\\\\.|g'`"
@@ -827,6 +813,26 @@ if test "z${EXPERIMENTAL}" = "z1"; then
   AC_MSG_RESULT([])
 fi
 
+#
+# Should come last to make sure we can already use the Makefiles.
+#
+AC_CONFIG_COMMANDS([packageheaders],
+#AC_CONFIG_COMMANDS_POST(
+[${RM} -rf include
+for m in `find . -name Makefile`
+do
+#	my_top_srcdir=`cd ${srcdir}; pwd`
+#	my_top_builddir=`pwd`
+	AS_IF(
+	   [${FGREP} -q nodist_pkginclude_HEADERS ${m}],
+	      [d=`AS_DIRNAME(["${m}"])`
+	      ${MAKE-make} -C "${d}" INSTALL_HEADER="${ac_abs_top_srcdir}/install-pkgheader.sh" includedir="${ac_abs_top_builddir}/include" install-nodist_pkgincludeHEADERS],
+	   [${FGREP} -q pkginclude_HEADERS ${m}],
+	      [d=`AS_DIRNAME(["${m}"])`
+	      ${MAKE-make} -C "${d}" INSTALL_HEADER="${ac_abs_top_srcdir}/install-pkgheader.sh" includedir="${ac_abs_top_builddir}/include" install-pkgincludeHEADERS],
+           [])
+done])
+
 #
 # flush everything to disk
 #

install-pkgheader.sh

@@ -18,6 +18,6 @@ done
 
 DST="$1"
 
-ln -s ${SOURCES} "${DST}"
+ln -sf ${SOURCES} "${DST}"