diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-05-31 09:47:04 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-05-31 09:47:04 +0000 |
commit | 15cca88e2666b7aae4e54112a21cb5c9bc312069 (patch) | |
tree | 8b31517b2e92f03da2b949831029cd9439ce7cef /Build/source/texk/dvipdfmx | |
parent | 18662309a8be07470a0bc6294a1fddf5ffcb8d72 (diff) |
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
Diffstat (limited to 'Build/source/texk/dvipdfmx')
-rw-r--r-- | Build/source/texk/dvipdfmx/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/Makefile.am | 28 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/Makefile.in | 49 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage | 22 |
5 files changed, 73 insertions, 34 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index 5caa1d1babd..35a8cd24487 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,3 +1,7 @@ +2011-05-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links. + 2011-05-03 Peter Breitenlohner <peb@mppmu.mpg.de> Imported snapshot 20110311. diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am index 6bd3206c60b..613b4f20549 100644 --- a/Build/source/texk/dvipdfmx/Makefile.am +++ b/Build/source/texk/dvipdfmx/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipdfmx/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -186,6 +186,13 @@ call_dvipdfmx_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" +bin_links = \ + dvipdfmx$(EXEEXT):dvipdfm \ + dvipdfmx$(EXEEXT):ebb \ + dvipdfmx$(EXEEXT):extractbb + +include $(srcdir)/../am/bin_links.am + ## Rebuild libkpathsea @KPATHSEA_RULE@ ## Rebuild libpng @@ -230,29 +237,24 @@ dist_man1_MANS = \ man/dvipdfm.1 \ man/dvipdft.1 -# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = \ extractbb:ebb include $(srcdir)/../am/man1_links.am -install-data-hook: install-man1-links - -install-exec-hook: +install-exec-hook: install-bin-links if WIN32 $(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) $(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT) $(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT) -else !WIN32 - cd $(DESTDIR)$(bindir) && \ - rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \ - $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) && \ - $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \ - $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) -endif !WIN32 +endif WIN32 + +install-data-hook: install-man1-links -uninstall-hook: uninstall-man1-links +uninstall-hook: uninstall-bin-links uninstall-man1-links +if WIN32 rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) +endif WIN32 diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in index 3e60d7ebc75..30ba81bad8d 100644 --- a/Build/source/texk/dvipdfmx/Makefile.in +++ b/Build/source/texk/dvipdfmx/Makefile.in @@ -44,7 +44,7 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ - $(srcdir)/../../build-aux/missing \ + $(srcdir)/../../build-aux/missing $(srcdir)/../am/bin_links.am \ $(srcdir)/../am/man1_links.am $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure ../../build-aux/config.guess \ @@ -461,6 +461,11 @@ dvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) call_dvipdfmx_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" +bin_links = \ + dvipdfmx$(EXEEXT):dvipdfm \ + dvipdfmx$(EXEEXT):ebb \ + dvipdfmx$(EXEEXT):extractbb + DISTCLEANFILES = config.force configdatadir = ${prefix}/texmf/dvipdfmx configdata_DATA = \ @@ -488,8 +493,6 @@ dist_man1_MANS = \ man/dvipdfm.1 \ man/dvipdft.1 - -# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = \ extractbb:ebb @@ -500,7 +503,7 @@ all: config.h .SUFFIXES: .c .lo .o .obj am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(srcdir)/../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -2205,6 +2208,23 @@ uninstall-man: uninstall-man1 # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` +.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 @KPATHSEA_RULE@ @LIBPNG_RULE@ @@ -2233,22 +2253,17 @@ uninstall-man1-links: rm -f $(DESTDIR)$(man1dir)/$$link.1; \ done -install-data-hook: install-man1-links - -install-exec-hook: +install-exec-hook: install-bin-links @WIN32_TRUE@ $(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) @WIN32_TRUE@ $(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT) @WIN32_TRUE@ $(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT) -@WIN32_FALSE@ cd $(DESTDIR)$(bindir) && \ -@WIN32_FALSE@ rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \ -@WIN32_FALSE@ $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) && \ -@WIN32_FALSE@ $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \ -@WIN32_FALSE@ $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) - -uninstall-hook: uninstall-man1-links - rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) - rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) + +install-data-hook: install-man1-links + +uninstall-hook: uninstall-bin-links uninstall-man1-links +@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) +@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) +@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) # 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/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog index 358e6ba2bf3..837aa9d0cc8 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2011-05-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-manpage: Adapted to modified extractbb manpage. + 2011-05-09 Peter Breitenlohner <peb@mppmu.mpg.de> * ../dvipdfmx-20110311/data/dvipdfmx.cfg: Synched from Master. diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage index 30b8ad6eb1a..ca7db940c17 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage @@ -1,19 +1,33 @@ diff -ur dvipdfmx-20110311.orig/man/extractbb.1 dvipdfmx-20110311/man/extractbb.1 --- dvipdfmx-20110311.orig/man/extractbb.1 2011-03-09 08:45:17.000000000 +0100 -+++ dvipdfmx-20110311/man/extractbb.1 2011-04-29 01:23:09.000000000 +0200 ++++ dvipdfmx-20110311/man/extractbb.1 2011-05-28 02:47:23.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "EXTRACTBB" "1" "30 August 2009" "20090708" "DVIPDFMx" -+.TH "EXTRACTBB" "1" "28 April 2011" "20110311" "DVIPDFMx" ++.TH "EXTRACTBB" "1" "6 May 2011" "20110311" "DVIPDFMx" .PP .SH "NAME" extractbb, ebb \- extract bounding box information from graphics files -@@ -59,7 +59,8 @@ +@@ -59,9 +59,22 @@ Write output in dvipdfm's ``bb'' format. .TP .B -x -Write output in dvipdfmx's ``xbb'' format (default). +Write output in dvipdfmx's ``xbb'' format (default), which is the same -+as that used by the PDF format. ++as that used by pdfTeX. .PD .PP ++.SH "OUTPUT FORMATS" ++.PP ++Here are more details about the bb and xbb formats: ++.PP ++The original ebb (from dvipdfm) ignored density information in bitmap ++images, and generated bounding boxes with 100px = 72bp = 1in. ++Unfortunately, screenshots (especially) tend to look bad with this ++approach. ++.PP ++So, extractbb (from dvipdfmx) uses density information if present. ++Otherwise, it generates bounding box with 100px = 100bp. This is what ++pdfTeX does. .SH "BUGS" + .PP + There is currently no way to specify which bounding box is taken |