Include <config.h> if HAVE_CONFIG_H.

[gnulib.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b4300e0..a849925 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,7 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
-  canon-host.c closeout.c dirname.c exclude.c filemode.c diacrit.c \
+  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
   full-write.c getopt.c getopt1.c getugroups.c hard-locale.c hash.c \
   human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
   makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \
@@ -59,6 +59,8 @@ stat.c: xstat.in
 # 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.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
 
 all-local: charset.alias ref-add.sed ref-del.sed
 
@@ -66,12 +68,17 @@ charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 install-exec-local: all-local
        $(mkinstalldirs) $(DESTDIR)$(libdir)
-       test -f $(charset_alias) \
-         && orig=$(charset_alias) \
-         || orig=charset.alias; \
-       sed -f ref-add.sed $$orig > $(charset_tmp)
-       $(INSTALL_DATA) $(charset_tmp) $(charset_alias)
-       rm -f $(charset_tmp)
+       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 \
+           sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+           $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+           rm -f $(charset_tmp) ; \
+         fi ; \
+       fi
 
 uninstall-local: all-local
        if test -f $(charset_alias); then \
@@ -86,8 +93,8 @@ uninstall-local: all-local
        fi
 
 charset.alias: config.charset
-       $(SHELL) $(srcdir)/config.charset '@host@' > $@-t
-       mv $@-t $@
+       $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+       mv t-$@ $@
 
 SUFFIXES = .sed .sin
 .sin.sed: