.

1 files changed, 44 insertions, 38 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index c9154c67d..546c7bf29 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,7 +56,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DSHAREDIR=\"$(datadir)\" @DEFS@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 ECHO_C = @ECHO_C@
@@ -104,7 +104,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-
 PERL = @PERL@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
@@ -158,7 +157,7 @@ target_alias = @target_alias@
 EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname uptime users who
 EXTRA_SCRIPTS = nohup
 
-bin_SCRIPTS = groups @OPTIONAL_BIN_ZCRIPTS@
+bin_SCRIPTS = groups $(OPTIONAL_BIN_ZCRIPTS)
 bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
   ginstall link ln dir vdir ls mkdir \
   mkfifo mknod mv readlink rm rmdir shred stat sync touch unlink \
@@ -167,10 +166,8 @@ bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
   basename date dirname echo env expr factor false \
   hostname id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
-  @OPTIONAL_BIN_PROGS@ @DF_PROG@
-
+  $(OPTIONAL_BIN_PROGS) $(DF_PROG)
 
-localedir = $(datadir)/locale
 
 noinst_HEADERS = \
   system.h sys2.h checksum.h copy.h cp-hash.h ls.h dircolors.h remove.h \
@@ -184,45 +181,45 @@ CLEANFILES = $(SCRIPTS) su
 
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
 
-# Sometimes, the expansion of @LIBINTL@ includes -lc which may
+# Sometimes, the expansion of $(LIBINTL) includes -lc which may
 # include modules defining variables like `optind', so libfetish.a
-# must precede @LIBINTL@ in order to ensure we use GNU getopt.
-# But libfetish.a must also follow @LIBINTL@, since libintl uses
+# must precede $(LIBINTL) in order to ensure we use GNU getopt.
+# But libfetish.a must also follow $(LIBINTL), since libintl uses
 # replacement functions defined in libfetish.a.
-LDADD = ../lib/libfetish.a @LIBINTL@ ../lib/libfetish.a
+LDADD = ../lib/libfetish.a $(LIBINTL) ../lib/libfetish.a
 
-dir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
-ls_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
-shred_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
-vdir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+shred_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
 
-sort_LDADD = $(LDADD) @POW_LIB@
+sort_LDADD = $(LDADD) $(POW_LIB)
 
 # for clock_gettime
-date_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
 
 # For sqrt
-factor_LDADD = $(LDADD) @SQRT_LIBM@
+factor_LDADD = $(LDADD) $(SQRT_LIBM)
 
 # If necessary, add -lm to resolve use of pow in lib/strtod.c.
 # If necessary, add -liconv to resolve use of iconv in lib/unicodeio.c.
-printf_LDADD = $(LDADD) @POW_LIB@ @LIBICONV@
+printf_LDADD = $(LDADD) $(POW_LIB) $(LIBICONV)
 
 # If necessary, add -lm to resolve use of floor, rint, modf.
-seq_LDADD = $(LDADD) @SEQ_LIBM@
+seq_LDADD = $(LDADD) $(SEQ_LIBM)
 
 # If necessary, add -lm to resolve the `pow' reference in lib/strtod.c
 # or for the fesetround reference in programs using nanosec.c.
 nanosec_libs = \
-  $(LDADD) @FESETROUND_LIBM@ @POW_LIB@ @LIB_CLOCK_GETTIME@ @LIB_NANOSLEEP@
+  $(LDADD) $(FESETROUND_LIBM) $(POW_LIB) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP)
 
 
 sleep_LDADD = $(nanosec_libs)
 tail_LDADD = $(nanosec_libs)
 
-uptime_LDADD = $(LDADD) @GETLOADAVG_LIBS@
+uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
 
-su_LDADD = $(LDADD) @LIB_CRYPT@
+su_LDADD = $(LDADD) $(LIB_CRYPT)
 
 SUFFIXES = .sh
 
@@ -253,20 +250,22 @@ rm_SOURCES = rm.c remove.c
 
 md5sum_SOURCES = md5sum.c md5.c
 sha1sum_SOURCES = md5sum.c sha1sum.c
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
-MAINTAINERCLEANFILES = dircolors.h \
-  wheel.h wheel-size.h
+localedir = $(datadir)/locale
 
+BUILT_SOURCES = localedir.h dircolors.h wheel-size.h wheel.h false.c
+DISTCLEANFILES = localedir.h
 
 wheel_size = 5
 
-BUILT_SOURCES = dircolors.h false.c wheel.h wheel-size.h
-
 # false exits nonzero even with --help or --version.
 # Tell automake to exempt it from that installcheck test.
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false
 
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
 all_programs = \
     $(bin_PROGRAMS) \
     $(bin_SCRIPTS) \
@@ -1396,6 +1395,7 @@ clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1472,9 +1472,9 @@ $(SCRIPTS): Makefile
 	rm -f $@ $@-t
 	sed \
 	  -e 's!@''bindir''@!$(bindir)!' \
-	  -e 's/@''GNU_PACKAGE''@/@GNU_PACKAGE@/' \
-	  -e 's/@''PACKAGE_BUGREPORT''@/@PACKAGE_BUGREPORT@/' \
-	  -e 's/@''VERSION''@/@VERSION@/' $< > $@-t
+	  -e 's/@''GNU_PACKAGE''@/$(GNU_PACKAGE)/' \
+	  -e 's/@''PACKAGE_BUGREPORT''@/$(PACKAGE_BUGREPORT)/' \
+	  -e 's/@''VERSION''@/$(VERSION)/' $< > $@-t
 	chmod +x $@-t
 	mv $@-t $@
 
@@ -1501,32 +1501,38 @@ install-exec-local: su$(EXEEXT)
 
 uninstall-local:
 # Remove su only if it's one we installed.
-	@if grep '@GNU_PACKAGE@' $(installed_su) > /dev/null 2>&1; then \
+	@if grep '$(GNU_PACKAGE)' $(installed_su) > /dev/null 2>&1; then \
 	  echo "  rm -f $(installed_su)"; \
 	  rm -f $(installed_su); \
 	else :; fi
-
+localedir.h: Makefile
+	@rm -f $@-t
+	echo '#define LOCALEDIR "$(localedir)"' >$@-t
+	@chmod a-w $@-t
+	cmp $@-t $@ 2>&1 > /dev/null && rm -f $@-t || { rm -f $@; mv $@-t $@; }
 dircolors.h: dcgen dircolors.hin
+	@rm -f $@ $@-t
 	$(PERL) -w -- $(srcdir)/dcgen $(srcdir)/dircolors.hin > $@-t
+	@chmod a-w $@-t
 	mv $@-t $@
-
 wheel-size.h: Makefile.am
+	@rm -f $@ $@-t
 	echo '#define WHEEL_SIZE $(wheel_size)' > $@-t
+	@chmod a-w $@-t
 	mv $@-t $@
-
 wheel.h: wheel-gen.pl Makefile.am
-	$(srcdir)/wheel-gen.pl $(wheel_size) \
-	  > $@-t
+	@rm -f $@ $@-t
+	$(srcdir)/wheel-gen.pl $(wheel_size) > $@-t
+	@chmod a-w $@-t
 	mv $@-t $@
-
 false.c: true.c
-	rm -f $@
+	@rm -f $@ $@-t
 	sed \
 	  -e s/true/false/g \
 	  -e s/success/failure/g \
 	  -e 's/(EXIT_SUCCESS)/(EXIT_FAILURE)/g' \
 	  $(srcdir)/true.c > $@-t
-	chmod a-w $@-t
+	@chmod a-w $@-t
 	mv $@-t $@
 # Ensure that the list of programs in README matches the list
 # of programs we can build.