diff --git a/Makefile.in b/Makefile.in
index fd48bef0..0bc04330 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ infodir = $(prefix)/info
 
 SHELL = /bin/sh
 
+SUBDIRS = testsuite
 # Files that can be generated, but should be up to date for a distribution.
 DISTDEP = info Makefile
 # Files to distribute.
@@ -131,6 +132,7 @@ install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs install-info
 	$(INSTALL_DATA) $(srcdir)/acconfig.h $(acdatadir)/acconfig.h
 	-if test -f autoscan; then \
 	$(INSTALL_PROGRAM) autoscan $(bindir)/autoscan; \
+	else :; fi
 	-if test -f shindent; then \
 	$(INSTALL_PROGRAM) shindent $(bindir)/shindent; \
 	$(INSTALL_DATA) $(srcdir)/acfunctions $(acdatadir)/acfunctions; \
@@ -169,17 +171,23 @@ Makefile: Makefile.in config.status
 config.status: configure
 	./config.status --recheck
 
-clean:
+clean mostlyclean distclean realclean::
+	for dir in $(SUBDIRS); do \
+	  echo making $@ in $$dir ; \
+	  (cd $$dir; $(MAKE) $@) ; \
+	done
+
+clean::
 	rm -f autoconf autoheader autoscan autoreconf shindent ifnames *.tmp
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.ma *.mas
 
-mostlyclean: clean
+mostlyclean:: clean
 
-distclean: clean
+distclean:: clean
 	rm -f Makefile config.status config.cache config.log
 
-realclean: distclean
+realclean:: distclean
 	rm -f TAGS *.info* INSTALL
 
 TAGS:
diff --git a/acspecific.m4 b/acspecific.m4
index a9535cb8..5c7a4e22 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -536,7 +536,7 @@ main()
 changequote([,])dnl
 AC_TEST_RUN([$ac_prog],
   ac_cv_type_getgroups=gid_t, ac_cv_type_getgroups=int)])dnl
-AC_DEFINE(GETGROUPS_T, $ac_cv_type_getgroups)
+AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups)
 ])dnl
 dnl
 define(AC_UID_T,
@@ -573,7 +573,7 @@ AC_CACHE_VAL(ac_cv_type_signal,
 #endif
 extern void (*signal ()) ();],
 [int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])dnl
-AC_DEFINE(RETSIGTYPE, $ac_cv_type_signal)
+AC_DEFINE_UNQUOTED(RETSIGTYPE, $ac_cv_type_signal)
 ])dnl
 dnl
 dnl
@@ -881,7 +881,7 @@ main ()
   exit (find_stack_direction() < 0);
 }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
   ac_cv_c_stack_direction=0)])dnl
-AC_DEFINE(STACK_DIRECTION, $ac_cv_c_stack_direction)
+AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
 fi
 AC_SUBST(ALLOCA)dnl
 ])dnl
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fd48bef0..0bc04330 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -48,6 +48,7 @@ infodir = $(prefix)/info
 
 SHELL = /bin/sh
 
+SUBDIRS = testsuite
 # Files that can be generated, but should be up to date for a distribution.
 DISTDEP = info Makefile
 # Files to distribute.
@@ -131,6 +132,7 @@ install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs install-info
 	$(INSTALL_DATA) $(srcdir)/acconfig.h $(acdatadir)/acconfig.h
 	-if test -f autoscan; then \
 	$(INSTALL_PROGRAM) autoscan $(bindir)/autoscan; \
+	else :; fi
 	-if test -f shindent; then \
 	$(INSTALL_PROGRAM) shindent $(bindir)/shindent; \
 	$(INSTALL_DATA) $(srcdir)/acfunctions $(acdatadir)/acfunctions; \
@@ -169,17 +171,23 @@ Makefile: Makefile.in config.status
 config.status: configure
 	./config.status --recheck
 
-clean:
+clean mostlyclean distclean realclean::
+	for dir in $(SUBDIRS); do \
+	  echo making $@ in $$dir ; \
+	  (cd $$dir; $(MAKE) $@) ; \
+	done
+
+clean::
 	rm -f autoconf autoheader autoscan autoreconf shindent ifnames *.tmp
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.ma *.mas
 
-mostlyclean: clean
+mostlyclean:: clean
 
-distclean: clean
+distclean:: clean
 	rm -f Makefile config.status config.cache config.log
 
-realclean: distclean
+realclean:: distclean
 	rm -f TAGS *.info* INSTALL
 
 TAGS:
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index a9535cb8..5c7a4e22 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -536,7 +536,7 @@ main()
 changequote([,])dnl
 AC_TEST_RUN([$ac_prog],
   ac_cv_type_getgroups=gid_t, ac_cv_type_getgroups=int)])dnl
-AC_DEFINE(GETGROUPS_T, $ac_cv_type_getgroups)
+AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups)
 ])dnl
 dnl
 define(AC_UID_T,
@@ -573,7 +573,7 @@ AC_CACHE_VAL(ac_cv_type_signal,
 #endif
 extern void (*signal ()) ();],
 [int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])dnl
-AC_DEFINE(RETSIGTYPE, $ac_cv_type_signal)
+AC_DEFINE_UNQUOTED(RETSIGTYPE, $ac_cv_type_signal)
 ])dnl
 dnl
 dnl
@@ -881,7 +881,7 @@ main ()
   exit (find_stack_direction() < 0);
 }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
   ac_cv_c_stack_direction=0)])dnl
-AC_DEFINE(STACK_DIRECTION, $ac_cv_c_stack_direction)
+AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
 fi
 AC_SUBST(ALLOCA)dnl
 ])dnl