X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.in;h=9c3e4a564cca80eda21cd970a1733086aa40d479;hb=5fb39ef116b06d1b5c3e737dcd0b0e0440fd1712;hp=896232d15acd2020651165d2761f0a6b20531d11;hpb=1f09109204733d22b4dfd2fa71ac4267f51e8b76;p=gnulib.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 896232d15..9c3e4a564 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -151,11 +151,12 @@ BUILT_SOURCES = getdate.c lstat.c stat.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = lstat.c stat.c
 
-EXTRA_DIST = xstat.in config.charset ref-add.sed.in ref-del.sed.in
+EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin
 
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 
-SUFFIXES = .sed .sed.in
+SUFFIXES = .sed .sin
 
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
 subdir = lib
@@ -228,14 +229,14 @@ $(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
 $(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
 $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
 DIST_COMMON =  $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in TODO \
-alloca.c chown.c depcomp dup2.c error.c error.h euidaccess.c \
-fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c getgroups.c \
-gethostname.c getline.c getloadavg.c getusershell.c group-member.c \
-lchown.c malloc.c memchr.c memcmp.c memcpy.c memmove.c memset.c mkdir.c \
-mktime.c mountlist.c nanosleep.c obstack.c obstack.h putenv.c realloc.c \
-regex.c rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c \
-strdup.c strftime.c strncasecmp.c strndup.c strpbrk.c strstr.c strtod.c \
-strtol.c strtoul.c strtoull.c strtoumax.c strverscmp.c utime.c
+alloca.c chown.c dup2.c error.c error.h euidaccess.c fileblocks.c \
+fnmatch.c fsusage.c ftruncate.c getdate.c getgroups.c gethostname.c \
+getline.c getloadavg.c getusershell.c group-member.c lchown.c malloc.c \
+memchr.c memcmp.c memcpy.c memmove.c memset.c mkdir.c mktime.c \
+mountlist.c nanosleep.c obstack.c obstack.h putenv.c realloc.c regex.c \
+rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c strdup.c \
+strftime.c strncasecmp.c strndup.c strpbrk.c strstr.c strtod.c strtol.c \
+strtoul.c strtoull.c strtoumax.c strverscmp.c utime.c
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -246,7 +247,7 @@ OBJECTS = $(am_libfetish_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .c .o .sed .sed.in .y
+.SUFFIXES: .c .o .sed .sin .y
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile
 
@@ -796,26 +797,26 @@ install-exec-local: all-local
 	test -f $(charset_alias) \
 	  && orig=$(charset_alias) \
 	  || orig=charset.alias; \
-	sed -f ref-add.sed $$orig > $(charset_alias)-t
-	$(INSTALL_DATA) $(charset_alias)-t $(charset_alias)
-	rm -f $(charset_alias)-t
+	sed -f ref-add.sed $$orig > $(charset_tmp)
+	$(INSTALL_DATA) $(charset_tmp) $(charset_alias)
+	rm -f $(charset_tmp)
 
 uninstall-local: all-local
 	if test -f $(charset_alias); then \
-	  sed -f ref-del.sed $(charset_alias) > $(charset_alias)-t; \
-	  if grep '^# Packages using this file: $$' $(charset_alias)-t \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
 	      > /dev/null; then \
 	    rm -f $(charset_alias); \
 	  else \
-	    $(INSTALL_DATA) $(charset_alias)-t $(charset_alias); \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
 	  fi; \
-	  rm -f $(charset_alias)-t; \
+	  rm -f $(charset_tmp); \
 	fi
 
 charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > $@-t
-	mv $@-t $@
-.sed.in.sed:
+	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	mv t-$@ $@
+.sin.sed:
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > $@-t
 	mv $@-t $@