From e36ce4f71f53fa852821a7005d3f11e4d4ebee4b Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 7 Jun 2003 06:07:38 +0000
Subject: [PATCH] Use $(...) notation, not @...@ for AC_REPLACE'd variables.

---
 modules/localcharset | 9 ++++-----
 modules/strtod       | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/localcharset b/modules/localcharset
index ebdf516dfc..fc0f6ea332 100644
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -33,13 +33,13 @@ all-local: charset.alias ref-add.sed ref-del.sed
 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 @@ uninstall-local: all-local
 	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 @@ Include:
 
 Maintainer:
 Bruno Haible
-
diff --git a/modules/strtod b/modules/strtod
index 267776f7dd..a1a450eb79 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -11,11 +11,10 @@ configure.ac:
 gl_FUNC_STRTOD
 
 Makefile.am:
-LIBS += @POW_LIB@
+LIBS += $(POW_LIB)
 
 Include:
 <stdlib.h>
 
 Maintainer:
 all
-
-- 
2.30.2