Merge euidaccess etc. from coreutils.

[gnulib.git] / modules / localcharset

diff --git a/modules/localcharset b/modules/localcharset
index a9ed902..9226276 100644 (file)
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -21,7 +21,7 @@ lib_SOURCES += localcharset.h localcharset.c
 EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 DEFS += -DLIBDIR=\"$(libdir)\"
 
-# The following is needed in order to install a simple file in $(libdir)
+# We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
 # packages so that "make uninstall" will remove the file if and only if it
 # is not used by another installed package.
@@ -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
@@ -72,3 +72,5 @@ CLEANFILES += charset.alias ref-add.sed ref-del.sed
 Include:
 "localcharset.h"
 
+Maintainer:
+Bruno Haible