diff --git a/ChangeLog b/ChangeLog
index 36b67520..bd8f6247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-08  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (AC_OUTPUT_FILES): Simplify some excess in
+	changequote.
+	(AC_OUTPUT_SUBDIRS): Likewise.
+
 2000-02-08  Akim Demaille  <akim@epita.fr>
 
 	* autoupdate.sh: Don't dump --help on --wrong-option.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 1ad7014c..2b044054 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3544,13 +3544,11 @@ changequote([, ])dnl
   esac
 
 ifdef([AC_PROVIDE_AC_PROG_INSTALL],
-[  case "$ac_given_INSTALL" in
-changequote(, )dnl
+[[  case "$ac_given_INSTALL" in
   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-changequote([, ])dnl
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
   esac
-])dnl
+]])dnl
 
   echo creating "$ac_file"
   rm -f "$ac_file"
@@ -4000,13 +3998,11 @@ changequote([, ])dnl
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
 ifdef([AC_PROVIDE_AC_PROG_INSTALL],
-      [  case "$ac_given_INSTALL" in
-changequote(, )dnl
+[[      case "$ac_given_INSTALL" in
         [/$]*) INSTALL="$ac_given_INSTALL" ;;
-changequote([, ])dnl
         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-])dnl
+      esac
+]])dnl
 
       echo "[running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 1ad7014c..2b044054 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3544,13 +3544,11 @@ changequote([, ])dnl
   esac
 
 ifdef([AC_PROVIDE_AC_PROG_INSTALL],
-[  case "$ac_given_INSTALL" in
-changequote(, )dnl
+[[  case "$ac_given_INSTALL" in
   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-changequote([, ])dnl
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
   esac
-])dnl
+]])dnl
 
   echo creating "$ac_file"
   rm -f "$ac_file"
@@ -4000,13 +3998,11 @@ changequote([, ])dnl
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
 ifdef([AC_PROVIDE_AC_PROG_INSTALL],
-      [  case "$ac_given_INSTALL" in
-changequote(, )dnl
+[[      case "$ac_given_INSTALL" in
         [/$]*) INSTALL="$ac_given_INSTALL" ;;
-changequote([, ])dnl
         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-])dnl
+      esac
+]])dnl
 
       echo "[running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.