diff options
Diffstat (limited to 'Build/source/texk/am')
-rw-r--r-- | Build/source/texk/am/man.am | 42 | ||||
-rw-r--r-- | Build/source/texk/am/script_links.am | 5 |
2 files changed, 24 insertions, 23 deletions
diff --git a/Build/source/texk/am/man.am b/Build/source/texk/am/man.am index 9d1e48c573c..7453c0aa7f0 100644 --- a/Build/source/texk/am/man.am +++ b/Build/source/texk/am/man.am @@ -1,6 +1,6 @@ ## texk/am/man.am: Makefile fragment for kpathsea and web2c manual pages. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## requires $(man_sources) @@ -9,7 +9,7 @@ SUFFIXES = .1 .man .ps .dvi .man.1: - sed -f sedscript $< >$@ + $(AM_V_GEN)sed -f sedscript $< >$@ man_files = $(man_sources:.man=.1) $(man_files): sedscript @@ -17,25 +17,25 @@ nodist_man1_MANS = $(man_files) # At present, all but VERSION should be unused. sedscript: $(KPATHSEA_PATHS_H)/kpathsea/paths.h - cp /dev/null sedscript - sed -n -e '/^#define/s/#define[ ][ ]*\([A-Z_a-z][A-Z_a-z]*\)[ ][ ]*\(.*\)/s%@\1@%\2%/p' \ - $< \ - | sed -e 's/"//g' -e 's/[ ]*\/\*[^*]*\*\///g' >>sedscript - echo 's%@VER''SION@%$(VERSION)%' >>sedscript - echo 's%@BINDIR@%$(bindir)%' >>sedscript - echo 's%@INFODIR@%$(infodir)%' >>sedscript - echo 's%@TEXINPUTDIR@%$(texinputdir)%' >>sedscript - echo 's%@MFINPUTDIR@%$(mfinputdir)%' >>sedscript - echo 's%@MPINPUTDIR@%$(mpinputdir)%' >>sedscript - echo 's%@FONTDIR@%$(fontdir)%' >>sedscript - echo 's%@FMTDIR@%$(fmtdir)%' >>sedscript - echo 's%@BASEDIR@%$(basedir)%' >>sedscript - echo 's%@MEMDIR@%$(memdir)%' >>sedscript - echo 's%@TEXPOOLDIR@%$(texpooldir)%' >>sedscript - echo 's%@MFPOOLDIR@%$(mfpooldir)%' >>sedscript - echo 's%@MPPOOLDIR@%$(mppooldir)%' >>sedscript - echo 's%@FONTMAPDIR@%$(dvipsdir)%' >>sedscript - echo 's%@LOCALMODES@%$(localmodes)%' >>sedscript + $(AM_V_GEN)( \ + sed -n -e '/^#define/s/#define[ ][ ]*\([A-Z_a-z][A-Z_a-z]*\)[ ][ ]*\(.*\)/s%@\1@%\2%/p' \ + $< \ + | sed -e 's/"//g' -e 's/[ ]*\/\*[^*]*\*\///g'; \ + echo 's%@VER''SION@%$(VERSION)%'; \ + echo 's%@BINDIR@%$(bindir)%'; \ + echo 's%@INFODIR@%$(infodir)%'; \ + echo 's%@TEXINPUTDIR@%$(texinputdir)%'; \ + echo 's%@MFINPUTDIR@%$(mfinputdir)%'; \ + echo 's%@MPINPUTDIR@%$(mpinputdir)%'; \ + echo 's%@FONTDIR@%$(fontdir)%'; \ + echo 's%@FMTDIR@%$(fmtdir)%'; \ + echo 's%@BASEDIR@%$(basedir)%'; \ + echo 's%@MEMDIR@%$(memdir)%'; \ + echo 's%@TEXPOOLDIR@%$(texpooldir)%'; \ + echo 's%@MFPOOLDIR@%$(mfpooldir)%'; \ + echo 's%@MPPOOLDIR@%$(mppooldir)%'; \ + echo 's%@FONTMAPDIR@%$(dvipsdir)%'; \ + echo 's%@LOCALMODES@%$(localmodes)%') >sedscript DITROFF = groff diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am index e6de7de244a..b7228de97ad 100644 --- a/Build/source/texk/am/script_links.am +++ b/Build/source/texk/am/script_links.am @@ -31,7 +31,7 @@ wrappers = $(all_scripts:=.exe) nodist_bin_SCRIPTS += $(wrappers) runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe $(wrappers): $(runscript) - $(LN_S) $(runscript) $@ + $(AM_V_GEN)$(LN_S) $(runscript) $@ endif WIN32_WRAP endif WIN32 @@ -67,7 +67,8 @@ install-links: cd $(DESTDIR)$(bindir) && \ for f in $($(TYPE)_scripts); do \ rm -f $$f; \ - echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ + if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ + else echo " LINK $$f"; fi; \ $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ done |