From 15cca88e2666b7aae4e54112a21cb5c9bc312069 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 31 May 2011 09:47:04 +0000 Subject: Use the Makefile fragment `bin_links.am' to create symlinks within $(bindir) For cygwin always create links `foo->bar.exe' and not `foo.exe->bar.exe' git-svn-id: svn://tug.org/texlive/trunk@22701 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipng/ChangeLog | 4 ++++ Build/source/texk/dvipng/Makefile.am | 14 +++++------ Build/source/texk/dvipng/Makefile.in | 46 +++++++++++++++++++++++------------- 3 files changed, 41 insertions(+), 23 deletions(-) (limited to 'Build/source/texk/dvipng') diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index b64f53a8206..33e48d88924 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2011-05-30 Peter Breitenlohner + + * Makefile.am: Use ../am/bin_links.am for $(bindir) links. + 2011-02-15 Peter Breitenlohner * Makefile.am, configure.ac [WIN32]: Add dvigif.exe wrapper. diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 30e3a63e91d..e40ab1e6dab 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipng/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -109,16 +109,16 @@ dvigif_LDADD = ## Rebuild libz @ZLIB_RULE@ +include $(srcdir)/../am/bin_links.am + +bin_links = dvipng$(EXEEXT):dvigif + if have_gif if WIN32 bin_PROGRAMS += dvigif else !WIN32 -install-exec-hook: - cd $(DESTDIR)$(bindir) && \ - rm -f dvigif$(EXEEXT) && \ - $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) -uninstall-hook: - rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) +install-exec-hook: install-bin-links +uninstall-hook: uninstall-bin-links endif !WIN32 endif have_gif diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 31bc72e0d94..8d2e7fcd03e 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -47,21 +47,21 @@ bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1) @have_ft2_or_t1_TRUE@ $(DVIPNG_TREE)/fontmap.c \ @have_ft2_or_t1_TRUE@ $(DVIPNG_TREE)/tfm.c -@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif -subdir = . DIST_COMMON = $(am__configure_deps) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ - $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.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)/../../build-aux/missing $(srcdir)/../am/bin_links.am \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.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 +@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ $(top_srcdir)/m4/makeinfo.m4 \ @@ -356,6 +356,7 @@ LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \ dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\" dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c dvigif_LDADD = +bin_links = dvipng$(EXEEXT):dvigif TESTS = dvipng.test CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png all: config.h @@ -365,7 +366,7 @@ all: config.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 $(srcdir)/../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1347,12 +1348,25 @@ config.force: $(dvipng_dependencies) @T1LIB_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ -@WIN32_FALSE@@have_gif_TRUE@install-exec-hook: -@WIN32_FALSE@@have_gif_TRUE@ cd $(DESTDIR)$(bindir) && \ -@WIN32_FALSE@@have_gif_TRUE@ rm -f dvigif$(EXEEXT) && \ -@WIN32_FALSE@@have_gif_TRUE@ $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) -@WIN32_FALSE@@have_gif_TRUE@uninstall-hook: -@WIN32_FALSE@@have_gif_TRUE@ rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) +.PHONY: install-bin-links uninstall-bin-links + +install-bin-links: +@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \ +@WIN32_FALSE@ for s in $(bin_links); do \ +@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ +@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \ +@WIN32_FALSE@ rm -f $$link; \ +@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \ +@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \ +@WIN32_FALSE@ done + +uninstall-bin-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 +@WIN32_FALSE@@have_gif_TRUE@install-exec-hook: install-bin-links +@WIN32_FALSE@@have_gif_TRUE@uninstall-hook: uninstall-bin-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. -- cgit v1.2.3