From 4e0aa3cac68c35a0bd5e9d78b67e820ae9fea4d0 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 8 Feb 2011 07:21:38 +0000 Subject: Use a Makefile fragment to (un)install manpage links git-svn-id: svn://tug.org/texlive/trunk@21344 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ChangeLog | 4 +++ Build/source/texk/am/man.am | 4 +++ Build/source/texk/am/man1_links.am | 26 ++++++++++++++++ Build/source/texk/dviljk/ChangeLog | 4 +++ Build/source/texk/dviljk/Makefile.am | 18 ++++++----- Build/source/texk/dviljk/Makefile.in | 48 ++++++++++++++++++++++-------- Build/source/texk/dvipng/ChangeLog | 4 +++ Build/source/texk/dvipng/doc/Makefile.am | 15 +++++----- Build/source/texk/dvipng/doc/Makefile.in | 35 ++++++++++++++++------ Build/source/texk/kpathsea/ChangeLog | 4 +++ Build/source/texk/kpathsea/man/Makefile.am | 22 ++++---------- Build/source/texk/kpathsea/man/Makefile.in | 13 +++++--- Build/source/texk/tetex/ChangeLog | 4 +++ Build/source/texk/tetex/Makefile.am | 20 ++++--------- Build/source/texk/tetex/Makefile.in | 48 +++++++++++++++++------------- Build/source/texk/web2c/man/ChangeLog | 4 +++ Build/source/texk/web2c/man/Makefile.am | 22 ++++---------- Build/source/texk/web2c/man/Makefile.in | 14 ++++++--- 18 files changed, 197 insertions(+), 112 deletions(-) create mode 100644 Build/source/texk/am/man1_links.am diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index c1e9486260a..a9e0ba0f48a 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2011-02-08 Peter Breitenlohner + + * am/man1_links.am: New Makefile fragments for manpage links. + 2010-03-09 Peter Breitenlohner * Makefile.am (EXTRA_DIST): Distribute the whole tests/ tree. diff --git a/Build/source/texk/am/man.am b/Build/source/texk/am/man.am index 5fe5dedffe3..9d1e48c573c 100644 --- a/Build/source/texk/am/man.am +++ b/Build/source/texk/am/man.am @@ -1,4 +1,8 @@ ## texk/am/man.am: Makefile fragment for kpathsea and web2c manual pages. +## +## Copyright (C) 2009 - 2011 Peter Breitenlohner +## You may freely use, modify and/or distribute this file. +## ## requires $(man_sources) ## requires $(KPATHSEA_PATHS_H) giving the directory of kpathsea/paths.h diff --git a/Build/source/texk/am/man1_links.am b/Build/source/texk/am/man1_links.am new file mode 100644 index 00000000000..e0d5aeeb1e2 --- /dev/null +++ b/Build/source/texk/am/man1_links.am @@ -0,0 +1,26 @@ +## texk/am/man1_links.am: Makefile fragment for manual page links. +## +## Copyright (C) 2011 Peter Breitenlohner +## You may freely use, modify and/or distribute this file. +## +## requires $(man1_links) +## Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 +.PHONY: install-man1-links uninstall-man1-links + +install-man1-links: + @cd $(DESTDIR)$(man1dir) && \ + for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + file=`echo $$s | sed 's,:.*,,'`; \ + rm -f $$link.1; \ + echo "creating link '$$link.1' -> '$$file.1'"; \ + $(LN_S) $$file.1 $$link.1 || exit 1; \ + done + +uninstall-man1-links: + @for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + rm -f $(DESTDIR)$(man1dir)/$$link.1; \ + done + + diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index 450697d8fbb..7ca16bbde81 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/ChangeLog @@ -1,3 +1,7 @@ +2011-02-08 Peter Breitenlohner + + * Makefile.am: Use ../am/man1_links.am for manpage links. + 2010-12-29 Peter Breitenlohner * Makefile.am, configure.ac: Ignore shell script for WIN32. diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am index 3aa4107d5fc..58ee1dd8476 100644 --- a/Build/source/texk/dviljk/Makefile.am +++ b/Build/source/texk/dviljk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dviljk/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -70,20 +70,24 @@ LDADD = libdvilj.a $(KPATHSEA_LIBS) dist_man1_MANS = dvihp.man dvilj.man -man1_links = dvilj2p.1 dvilj4.1 dvilj4l.1 dvilj6.1 +# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 +man1_links = \ + dvilj:dvilj2p \ + dvilj:dvilj4 \ + dvilj:dvilj4l \ + dvilj:dvilj6 + +include $(top_srcdir)/../am/man1_links.am install-exec-hook: cd $(DESTDIR)$(bindir) && \ rm -f dvilj6$(EXEEXT) && \ $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT) -install-data-hook: - cd $(DESTDIR)$(man1dir) && \ - for f in $(man1_links); do rm -f $$f; $(LN_S) dvilj.1 $$f; done +install-data-hook: install-man1-links -uninstall-hook: +uninstall-hook: uninstall-man1-links rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT) - for f in $(man1_links); do rm -f $(DESTDIR)$(man1dir)/$$f; done VERSION = `grep 'define VERSION' $(srcdir)/dvi2xx.c | sed -e 's/^.*version //' -e 's/).*//'` if MAINTAINER_MODE diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index 2f1c8365262..7fffdddf58e 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/Makefile.in @@ -38,7 +38,6 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = dvilj$(EXEEXT) dvilj2p$(EXEEXT) dvilj4$(EXEEXT) \ dvilj4l$(EXEEXT) -subdir = . DIST_COMMON = README $(am__configure_deps) \ $(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \ $(srcdir)/../../build-aux/config.guess \ @@ -48,11 +47,13 @@ DIST_COMMON = README $(am__configure_deps) \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/c-auto.in \ - $(top_srcdir)/configure ../../build-aux/config.guess \ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/ltmain.sh \ - ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap AUTHORS ChangeLog INSTALL NEWS + $(top_srcdir)/../am/man1_links.am $(top_srcdir)/configure \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/ltmain.sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \ + ChangeLog INSTALL NEWS +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ @@ -313,7 +314,14 @@ dvilj4l_SOURCES = \ LDADD = libdvilj.a $(KPATHSEA_LIBS) dist_man1_MANS = dvihp.man dvilj.man -man1_links = dvilj2p.1 dvilj4.1 dvilj4l.1 dvilj6.1 + +# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 +man1_links = \ + dvilj:dvilj2p \ + dvilj:dvilj4 \ + dvilj:dvilj4l \ + dvilj:dvilj6 + EXTRA_DIST = dvilj.pod DISTCLEANFILES = dvilj.ps all: c-auto.h @@ -323,7 +331,7 @@ all: c-auto.h .SUFFIXES: .c .lo .o .obj am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -961,19 +969,33 @@ $(dvilj4_OBJECTS): libdvilj.a $(dvilj4l_OBJECTS): libdvilj.a @KPATHSEA_RULE@ +.PHONY: install-man1-links uninstall-man1-links + +install-man1-links: + @cd $(DESTDIR)$(man1dir) && \ + for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + file=`echo $$s | sed 's,:.*,,'`; \ + rm -f $$link.1; \ + echo "creating link '$$link.1' -> '$$file.1'"; \ + $(LN_S) $$file.1 $$link.1 || exit 1; \ + done + +uninstall-man1-links: + @for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + rm -f $(DESTDIR)$(man1dir)/$$link.1; \ + done install-exec-hook: cd $(DESTDIR)$(bindir) && \ rm -f dvilj6$(EXEEXT) && \ $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT) -install-data-hook: - cd $(DESTDIR)$(man1dir) && \ - for f in $(man1_links); do rm -f $$f; $(LN_S) dvilj.1 $$f; done +install-data-hook: install-man1-links -uninstall-hook: +uninstall-hook: uninstall-man1-links rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT) - for f in $(man1_links); do rm -f $(DESTDIR)$(man1dir)/$$f; done @MAINTAINER_MODE_TRUE@dvilj.man: dvilj.pod dvi2xx.c @MAINTAINER_MODE_TRUE@ pod2man --center="TeX-Live" --release="Version $(VERSION)" $< >$@ dvilj.ps: dvilj.man diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 7059ee234a7..48dd9d4b67e 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2011-02-08 Peter Breitenlohner + + * doc/Makefile.am: Use ../am/man1_links.am for manpage links. + 2010-12-16 Peter Breitenlohner * doc/Makefile.am: Check that the doc/*.texi files are copies diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am index 0dd468b48e5..7be4acd76e4 100644 --- a/Build/source/texk/dvipng/doc/Makefile.am +++ b/Build/source/texk/dvipng/doc/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipng/doc/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. # info_TEXINFOS = \ @@ -39,13 +39,14 @@ dvipng.1: dvipng.texi readme.texi dvipng.pod > dvipng.1 rm dvipng.pod +# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 +man1_links = dvipng:dvigif + +include $(top_srcdir)/../am/man1_links.am + if have_gif -install-data-hook: - cd $(DESTDIR)$(man1dir) && \ - rm -f dvigif.1 && \ - $(LN_S) dvipng.1 dvigif.1 -uninstall-hook: - rm -f $(DESTDIR)$(man1dir)/dvigif.1 +install-data-hook: install-man1-links +uninstall-hook: uninstall-man1-links endif have_gif DISTCLEANFILES = doc-stamp diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in index 9d0947ba42b..5fc697ccc6f 100644 --- a/Build/source/texk/dvipng/doc/Makefile.in +++ b/Build/source/texk/dvipng/doc/Makefile.in @@ -34,9 +34,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = doc DIST_COMMON = $(dist_man1_MANS) $(dist_noinst_SCRIPTS) \ - $(dvipng_TEXINFOS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in + $(dvipng_TEXINFOS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/man1_links.am +subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ $(top_srcdir)/m4/makeinfo.m4 \ @@ -258,13 +259,16 @@ dvipng_TEXINFOS = \ BUILT_SOURCES = doc-stamp dist_noinst_SCRIPTS = texi2pod.pl dist_man1_MANS = dvipng.1 + +# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 +man1_links = dvipng:dvigif DISTCLEANFILES = doc-stamp all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .dvi .html .info .pdf .ps .texi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -758,13 +762,26 @@ dvipng.1: dvipng.texi readme.texi pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ dvipng.pod > dvipng.1 rm dvipng.pod +.PHONY: install-man1-links uninstall-man1-links + +install-man1-links: + @cd $(DESTDIR)$(man1dir) && \ + for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + file=`echo $$s | sed 's,:.*,,'`; \ + rm -f $$link.1; \ + echo "creating link '$$link.1' -> '$$file.1'"; \ + $(LN_S) $$file.1 $$link.1 || exit 1; \ + done + +uninstall-man1-links: + @for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + rm -f $(DESTDIR)$(man1dir)/$$link.1; \ + done -@have_gif_TRUE@install-data-hook: -@have_gif_TRUE@ cd $(DESTDIR)$(man1dir) && \ -@have_gif_TRUE@ rm -f dvigif.1 && \ -@have_gif_TRUE@ $(LN_S) dvipng.1 dvigif.1 -@have_gif_TRUE@uninstall-hook: -@have_gif_TRUE@ rm -f $(DESTDIR)$(man1dir)/dvigif.1 +@have_gif_TRUE@install-data-hook: install-man1-links +@have_gif_TRUE@uninstall-hook: uninstall-man1-links # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 2f4210ee945..12d5ea1ea62 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2011-02-08 Peter Breitenlohner + + * man/Makefile.am: Use ../am/man1_links.am for manpage links. + 2011-02-02 Karl Berry * texmf.cnf (TEXMFROOT): new variable, $SELFAUTOPARENT by default, diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am index 6a929764624..f5860ec1bd3 100644 --- a/Build/source/texk/kpathsea/man/Makefile.am +++ b/Build/source/texk/kpathsea/man/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/kpathsea/man/ ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## man_sources = \ @@ -23,19 +23,9 @@ include $(top_srcdir)/../am/man.am man1_links = \ mktexlsr:texhash -install-data-hook: - @cd $(DESTDIR)$(man1dir) && \ - for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link.1; \ - echo "creating link '$$link.1' -> '$$file.1'"; \ - $(LN_S) $$file.1 $$link.1 || exit 1; \ - done - -uninstall-hook: - @for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - rm -f $(DESTDIR)$(man1dir)/$$link.1; \ - done +include $(top_srcdir)/../am/man1_links.am + +install-data-hook: install-man1-links + +uninstall-hook:uninstall-man1-links diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in index 6b2c11bcb1a..a7d67a63091 100644 --- a/Build/source/texk/kpathsea/man/Makefile.in +++ b/Build/source/texk/kpathsea/man/Makefile.in @@ -34,7 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/../am/man.am + $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -228,7 +228,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .1 .man .ps .dvi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -498,8 +498,9 @@ sedscript: $(KPATHSEA_PATHS_H)/kpathsea/paths.h .1.ps: $(DITROFF) -Tps -man $< >$@ +.PHONY: install-man1-links uninstall-man1-links -install-data-hook: +install-man1-links: @cd $(DESTDIR)$(man1dir) && \ for s in $(man1_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ @@ -509,12 +510,16 @@ install-data-hook: $(LN_S) $$file.1 $$link.1 || exit 1; \ done -uninstall-hook: +uninstall-man1-links: @for s in $(man1_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ rm -f $(DESTDIR)$(man1dir)/$$link.1; \ done +install-data-hook: install-man1-links + +uninstall-hook:uninstall-man1-links + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 53425763f96..0c6a6286e56 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2011-02-08 Peter Breitenlohner + + * Makefile.am: Use ../am/man1_links.am for manpage links. + 2011-01-07 Peter Breitenlohner * Makefile.am, configure.ac [WIN32]: Install wrapper binary for diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am index 46541eaa7ae..b25ae06284a 100644 --- a/Build/source/texk/tetex/Makefile.am +++ b/Build/source/texk/tetex/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/tetex/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -102,6 +102,8 @@ man1_links = $(bin_links) \ texconfig:texconfig-sys \ updmap:updmap-sys +include $(top_srcdir)/../am/man1_links.am + install-exec-hook: if !WIN32 @cd $(DESTDIR)$(bindir) && \ @@ -114,27 +116,15 @@ if !WIN32 done endif !WIN32 -install-data-hook: - @cd $(DESTDIR)$(man1dir) && \ - for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link.1; \ - echo "creating link '$$link.1' -> '$$file.1'"; \ - $(LN_S) $$file.1 $$link.1 || exit 1; \ - done +install-data-hook: install-man1-links -uninstall-hook: +uninstall-hook: uninstall-man1-links if !WIN32 @for s in $(bin_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ rm -f $(DESTDIR)$(bindir)/$$link; \ done endif !WIN32 - @for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - rm -f $(DESTDIR)$(man1dir)/$$link.1; \ - done EXTRA_DIST += \ README.texdoctk diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index 11145c49854..92fbe84b289 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -33,18 +33,19 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -subdir = . DIST_COMMON = $(am__configure_deps) $(dist_man1_MANS) \ $(dist_man5_MANS) $(dist_texconfig_DATA) \ $(dist_texconfig_SCRIPTS) $(dist_web2c_DATA) \ $(nobase_dist_texconf_DATA) \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - ../../build-aux/config.guess ../../build-aux/config.sub \ - ../../build-aux/depcomp ../../build-aux/install-sh \ - ../../build-aux/ltmain.sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog + $(srcdir)/Makefile.in $(top_srcdir)/../am/man1_links.am \ + $(top_srcdir)/configure ../../build-aux/config.guess \ + ../../build-aux/config.sub ../../build-aux/depcomp \ + ../../build-aux/install-sh ../../build-aux/ltmain.sh \ + ../../build-aux/missing ../../build-aux/texinfo.tex \ + ../../build-aux/ylwrap ChangeLog +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/configure.ac @@ -277,7 +278,7 @@ all: all-am .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -812,6 +813,23 @@ uninstall-man: uninstall-man1 uninstall-man5 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(win32_aliases): $(runscript) @WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@ +.PHONY: install-man1-links uninstall-man1-links + +install-man1-links: + @cd $(DESTDIR)$(man1dir) && \ + for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + file=`echo $$s | sed 's,:.*,,'`; \ + rm -f $$link.1; \ + echo "creating link '$$link.1' -> '$$file.1'"; \ + $(LN_S) $$file.1 $$link.1 || exit 1; \ + done + +uninstall-man1-links: + @for s in $(man1_links); do \ + link=`echo $$s | sed 's,.*:,,'`; \ + rm -f $(DESTDIR)$(man1dir)/$$link.1; \ + done install-exec-hook: @WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \ @@ -823,25 +841,13 @@ install-exec-hook: @WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \ @WIN32_FALSE@ done -install-data-hook: - @cd $(DESTDIR)$(man1dir) && \ - for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link.1; \ - echo "creating link '$$link.1' -> '$$file.1'"; \ - $(LN_S) $$file.1 $$link.1 || exit 1; \ - done +install-data-hook: install-man1-links -uninstall-hook: +uninstall-hook: uninstall-man1-links @WIN32_FALSE@ @for s in $(bin_links); do \ @WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done - @for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - rm -f $(DESTDIR)$(man1dir)/$$link.1; \ - done run-texlinks: PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks) diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog index 85650b52c57..fbc4f61bde8 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,7 @@ +2011-02-08 Peter Breitenlohner + + * Makefile.am: Use ../../am/man1_links.am for manpage links. + 2010-12-23 Peter Breitenlohner * Makefile.am (install-data-hook): Check symlink creation. diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am index 1c13063df99..f134c9f25f4 100644 --- a/Build/source/texk/web2c/man/Makefile.am +++ b/Build/source/texk/web2c/man/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/man/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## man_sources = $(bootstrap_man_sources) @@ -81,21 +81,11 @@ misc_man_sources = \ include $(top_srcdir)/../am/man.am -install-data-hook: - @cd $(DESTDIR)$(man1dir) && \ - for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link.1; \ - echo "creating link '$$link.1' -> '$$file.1'"; \ - $(LN_S) $$file.1 $$link.1 || exit 1; \ - done - -uninstall-hook: - @for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - rm -f $(DESTDIR)$(man1dir)/$$link.1; \ - done +include $(top_srcdir)/../am/man1_links.am + +install-data-hook: install-man1-links + +uninstall-hook:uninstall-man1-links ## Obsolete ? ## diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index bce2a3b42f5..89c0fbba1c4 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -48,7 +48,8 @@ host_triplet = @host@ @ALEPH_TRUE@am__append_13 = aleph.man @ALEPH_TRUE@am__append_14 = aleph:lamed DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/../am/man.am ChangeLog + $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am \ + ChangeLog subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ @@ -343,7 +344,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .1 .man .ps .dvi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -613,8 +614,9 @@ sedscript: $(KPATHSEA_PATHS_H)/kpathsea/paths.h .1.ps: $(DITROFF) -Tps -man $< >$@ +.PHONY: install-man1-links uninstall-man1-links -install-data-hook: +install-man1-links: @cd $(DESTDIR)$(man1dir) && \ for s in $(man1_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ @@ -624,12 +626,16 @@ install-data-hook: $(LN_S) $$file.1 $$link.1 || exit 1; \ done -uninstall-hook: +uninstall-man1-links: @for s in $(man1_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ rm -f $(DESTDIR)$(man1dir)/$$link.1; \ done +install-data-hook: install-man1-links + +uninstall-hook:uninstall-man1-links + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- cgit v1.2.3