X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=a84992521514dcbf103b540a92425ebd7d41b40b;hb=e09a10a64b73f68041ba64de52dba9c91d04bca1;hp=73a7cb5a8fe0ffa7bc2fa2c1a6e0754e9f3b16d0;hpb=4ca9a70d88484c57e106ca02a8f33bede2cc49c2;p=gnulib.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 73a7cb5a8..a84992521 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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 \