--- a/libcruft/configure.in
+++ b/libcruft/configure.in
@@ -26,13 +26,9 @@
 
 AC_PROG_INSTALL
 
-define([tmpA], [Makefile Makerules])dnl
-define([tmpB], [blas/Makefile balgen/Makefile dassl/Makefile])dnl
-define([tmpC], [eispack/Makefile fftpack/Makefile fsqp/Makefile])dnl
-define([tmpD], [lapack/Makefile linpack/Makefile minpack/Makefile])dnl
-define([tmpE], [misc/Makefile npsol/Makefile odepack/Makefile])dnl
-define([tmpF], [qpsol/Makefile quadpack/Makefile ranlib/Makefile])dnl
-define([tmpG], [slatec-fn/Makefile villad/Makefile])dnl
-define([cruftdirs], [tmpA tmpB tmpC tmpD tmpE tmpF tmpG])dnl
-
-AC_OUTPUT([cruftdirs])
+AC_OUTPUT(Makefile Makerules blas/Makefile balgen/Makefile
+          dassl/Makefile eispack/Makefile fftpack/Makefile
+          fsqp/Makefile lapack/Makefile linpack/Makefile
+          minpack/Makefile misc/Makefile npsol/Makefile
+          odepack/Makefile qpsol/Makefile quadpack/Makefile
+          ranlib/Makefile slatec-fn/Makefile villad/Makefile)

--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -26,13 +26,9 @@
 
 AC_PROG_INSTALL
 
-define([tmpA], [Makefile control/Makefile elfun/Makefile])dnl
-define([tmpB], [general/Makefile image/Makefile])dnl
-define([tmpC], [linear-algebra/Makefile miscellaneous/Makefile])dnl
-define([tmpD], [plot/Makefile polynomial/Makefile set/Makefile])dnl
-define([tmpE], [signal/Makefile specfun/Makefile])dnl
-define([tmpF], [special-matrix/Makefile startup/Makefile])dnl
-define([tmpG], [statistics/Makefile strings/Makefile time/Makefile])dnl
-define([scriptdirs], [tmpA tmpB tmpC tmpD tmpE tmpF tmpG])dnl
-
-AC_OUTPUT([scriptdirs])
+AC_OUTPUT(Makefile audio/Makefile control/Makefile elfun/Makefile
+	  general/Makefile image/Makefile linear-algebra/Makefile
+	  miscellaneous/Makefile plot/Makefile polynomial/Makefile
+	  set/Makefile signal/Makefile specfun/Makefile
+	  special-matrix/Makefile startup/Makefile statistics/Makefile
+	  strings/Makefile time/Makefile)