From d4aa787bcd1653b8870badb2daca7807c707b131 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sun, 7 Dec 2014 13:04:51 +0000 Subject: freetype 2.5.4 git-svn-id: svn://tug.org/texlive/trunk@35761 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 4 ++++ Build/source/texk/kpathsea/Makefile.am | 10 ++++------ Build/source/texk/kpathsea/Makefile.in | 14 ++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'Build/source/texk/kpathsea') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 1bf8449a1b3..8e8bc495d17 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2014-12-06 Peter Breitenlohner + + * Makefile.am [kpathsea.h]: Improved output for silent rules. + 2014-12-05 Karl Berry * kpsewhich.c (help_formats): new fn for new option --help-formats. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 03c0cfab060..17ab473710a 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -220,15 +220,13 @@ stamp-kpathsea: Makefile paths.h echo '/* collecting all public kpathsea headers. */'; \ for f in config.h paths.h $(direct_headers); do \ echo "#include "; \ - done ) >kpathsea.tmp - @if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \ + done ) >kpathsea.tmp && \ + if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \ echo "kpathsea.h is unchanged"; \ else \ - echo "cp kpathsea.tmp kpathsea.h"; \ + echo "generated kpathsea.h"; \ cp kpathsea.tmp kpathsea.h; \ - fi - rm -f kpathsea.tmp - date >$@ + fi && rm -f kpathsea.tmp && date >$@ EXTRA_DIST += bsnl.awk cnf-to-paths.awk diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 69e6fd8582c..159bf11e7bd 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -110,8 +110,8 @@ DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ - $(srcdir)/kpathsea.pc.in putenv.c strtol.c strstr.c \ - strcasecmp.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \ + $(srcdir)/kpathsea.pc.in strstr.c strcasecmp.c strtol.c \ + putenv.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \ $(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \ $(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \ $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \ @@ -2254,15 +2254,13 @@ stamp-kpathsea: Makefile paths.h echo '/* collecting all public kpathsea headers. */'; \ for f in config.h paths.h $(direct_headers); do \ echo "#include "; \ - done ) >kpathsea.tmp - @if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \ + done ) >kpathsea.tmp && \ + if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \ echo "kpathsea.h is unchanged"; \ else \ - echo "cp kpathsea.tmp kpathsea.h"; \ + echo "generated kpathsea.h"; \ cp kpathsea.tmp kpathsea.h; \ - fi - rm -f kpathsea.tmp - date >$@ + fi && rm -f kpathsea.tmp && date >$@ install-exec-local: installdirs-am @WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \ -- cgit v1.2.3