diff --git a/edit/ChangeLog b/edit/ChangeLog
index 89cda5e3c..6268cadd0 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-04  Pavel Roskin  <proski@gnu.org>
 
+	* Makefile.am (AM_CFLAGS): Remove CFLAGS, don't use substituted
+	values directly.
+
 	* syntax.c (syntax_text): Remove useless ']' in the Perl and
 	Python rules.  Change shell script rule to use more portable
 	regular expression.
diff --git a/edit/Makefile.am b/edit/Makefile.am
index 02be1d6a6..1a6031d6e 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = $(GLIB_CFLAGS)
 AM_CPPFLAGS = -DMIDNIGHT
 
 if USE_EDIT
diff --git a/slang/ChangeLog b/slang/ChangeLog
index 4aab2f83a..84d2086be 100644
--- a/slang/ChangeLog
+++ b/slang/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-04  Pavel Roskin  <proski@gnu.org>
+
+	* Makefile.am (AM_CFLAGS): Remove CFLAGS, don't use substituted
+	values directly.
+
 2001-08-26  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.am: Don't install libmcslang.a.
diff --git a/slang/Makefile.am b/slang/Makefile.am
index 30a3877a2..b585d7055 100644
--- a/slang/Makefile.am
+++ b/slang/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = $(GLIB_CFLAGS)
 
 if INCLUDED_SLANG
 noinst_LIBRARIES = libmcslang.a