--- Makefile.am.old	2009-02-04 00:39:46.000000000 +0100
+++ Makefile.am	2009-09-30 20:24:50.000000000 +0200
@@ -418,10 +418,10 @@
 	for f in $(pkglib_LTLIBRARIES); do . ./$$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0; done
 
 authlib.html: authlib.html.in
-	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=authlib.html
 
 authlib.3: authlib.3.in
-	CONFIG_FILES=authlib.3 CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=authlib.3
 
 if HAVE_SGML
 authpasswd.html: authpasswd.sgml docbook/sgml2html
@@ -494,7 +494,7 @@
 endif
 
 README_authlib.html: README_authlib.html.in config.status
-	CONFIG_FILES=README_authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=README_authlib.html
 
 authdaemond.o: authdaemonrc.h authdaemond.c
 
--- userdb/Makefile.am.old	2008-08-23 19:46:28.000000000 +0200
+++ userdb/Makefile.am	2009-09-30 20:29:14.000000000 +0200
@@ -25,22 +25,22 @@
 CLEANFILES=$(man8) $(noinst_DATA) dummy
 
 makeuserdb.html: makeuserdb.html.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=$@
 
 makeuserdb.8: makeuserdb.8.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=$@
 
 userdb.html: userdb.html.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=$@
 
 userdb.8: userdb.8.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=$@
 
 userdbpw.html: userdbpw.html.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=$@
 
 userdbpw.8: userdbpw.8.in
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	$(SHELL) ./config.status --file=$@
 
 if HAVE_SGML
 makeuserdb.html.in: makeuserdb.sgml ../docbook/sgml2html