# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 1054966058 0
# Node ID 546156f97d12afd92b50aedfbc8c2fab52e5a1a3
# Parent  f83de03df61cd685bb78aa66c04ef0f63b29c9c9
Use $(...) notation, not @...@ for AC_REPLACE'd variables.

diff --git a/modules/localcharset b/modules/localcharset
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -33,13 +33,13 @@
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 install-exec-local: all-local
-	test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
 	if test -f $(charset_alias); then \
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	  rm -f $(charset_tmp) ; \
 	else \
-	  if test @GLIBC21@ = no; then \
+	  if test $(GLIBC21) = no; then \
 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	    rm -f $(charset_tmp) ; \
@@ -59,12 +59,12 @@
 	fi
 
 charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
 	mv t-$@ $@
 
 SUFFIXES += .sed .sin
 .sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
 	mv t-$@ $@
 
 CLEANFILES += charset.alias ref-add.sed ref-del.sed
@@ -74,4 +74,3 @@
 
 Maintainer:
 Bruno Haible
-
diff --git a/modules/strtod b/modules/strtod
--- a/modules/strtod
+++ b/modules/strtod
@@ -11,11 +11,10 @@
 gl_FUNC_STRTOD
 
 Makefile.am:
-LIBS += @POW_LIB@
+LIBS += $(POW_LIB)
 
 Include:
 <stdlib.h>
 
 Maintainer:
 all
-