diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-10-04 15:41:38 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-10-04 15:41:38 +0000 |
commit | 3817bdb7c9936db23e18b74cf16fb234c1957a32 (patch) | |
tree | 04a776540153c27aed626b361f0c381c3981c675 /Build/source/utils | |
parent | 37b29e92d678aeb977a53c3ec164cac174fb282e (diff) |
Bug fix: Make sure that 'make distcheck' removes all generated files
but keeps all distributed ones
git-svn-id: svn://tug.org/texlive/trunk@24189 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r-- | Build/source/utils/tpic2pdftex/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/utils/tpic2pdftex/Makefile.am | 10 | ||||
-rw-r--r-- | Build/source/utils/tpic2pdftex/Makefile.in | 45 |
3 files changed, 31 insertions, 29 deletions
diff --git a/Build/source/utils/tpic2pdftex/ChangeLog b/Build/source/utils/tpic2pdftex/ChangeLog index 83786b17c1c..5f61b06318e 100644 --- a/Build/source/utils/tpic2pdftex/ChangeLog +++ b/Build/source/utils/tpic2pdftex/ChangeLog @@ -1,3 +1,8 @@ +2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (EXTRA_DIST): Add tpic2pdftex and tpic2pdftex.1, + for 'make dist' on Windows and MinGW. + 2011-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> * tpic2pdftex: Fix a syntax error (typo). diff --git a/Build/source/utils/tpic2pdftex/Makefile.am b/Build/source/utils/tpic2pdftex/Makefile.am index 8cf97afc6f4..c3099484126 100644 --- a/Build/source/utils/tpic2pdftex/Makefile.am +++ b/Build/source/utils/tpic2pdftex/Makefile.am @@ -1,15 +1,15 @@ ## Makefile.am for the TeX Live subdirectory utils/tpic2pdftex/ ## -## Copyright (C) 2009, 2010 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 if !WIN32 -dist_bin_SCRIPTS = tpic2pdftex - -dist_man1_MANS = tpic2pdftex.1 +bin_SCRIPTS = tpic2pdftex +man1_MANS = tpic2pdftex.1 endif !WIN32 +EXTRA_DIST = tpic2pdftex tpic2pdftex.1 pic_files = beamerexample.pic example.pic tpic_files = $(pic_files:.pic=.tpic) @@ -46,5 +46,5 @@ CLEANFILES = $(pic_files:.pic=.log) *.aux *.nav *.out *.snm *.toc DISTCLEANFILES = $(pdf_files) $(tex_files) $(tpic_files) -EXTRA_DIST = $(exp_files) $(pic_files) +EXTRA_DIST += $(exp_files) $(pic_files) diff --git a/Build/source/utils/tpic2pdftex/Makefile.in b/Build/source/utils/tpic2pdftex/Makefile.in index dd787b781bc..89c3754d8bd 100644 --- a/Build/source/utils/tpic2pdftex/Makefile.in +++ b/Build/source/utils/tpic2pdftex/Makefile.in @@ -33,9 +33,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = README $(am__configure_deps) \ - $(am__dist_bin_SCRIPTS_DIST) $(dist_check_SCRIPTS) \ - $(dist_man1_MANS) $(srcdir)/../../build-aux/install-sh \ +DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \ + $(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 \ @@ -52,7 +51,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__dist_bin_SCRIPTS_DIST = tpic2pdftex am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -75,12 +73,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" -SCRIPTS = $(dist_bin_SCRIPTS) +SCRIPTS = $(bin_SCRIPTS) SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 NROFF = nroff -MANS = $(dist_man1_MANS) +MANS = $(man1_MANS) am__tty_colors = \ red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -179,8 +177,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -@WIN32_FALSE@dist_bin_SCRIPTS = tpic2pdftex -@WIN32_FALSE@dist_man1_MANS = tpic2pdftex.1 +@WIN32_FALSE@bin_SCRIPTS = tpic2pdftex +@WIN32_FALSE@man1_MANS = tpic2pdftex.1 +EXTRA_DIST = tpic2pdftex tpic2pdftex.1 $(exp_files) $(pic_files) pic_files = beamerexample.pic example.pic tpic_files = $(pic_files:.pic=.tpic) tex_files = $(pic_files:.pic=.tex) @@ -190,7 +189,6 @@ dist_check_SCRIPTS = tpic2pdftex.test exp_files = $(pic_files:.pic=.exp) CLEANFILES = $(pic_files:.pic=.log) *.aux *.nav *.out *.snm *.toc DISTCLEANFILES = $(pdf_files) $(tex_files) $(tpic_files) -EXTRA_DIST = $(exp_files) $(pic_files) all: all-am .SUFFIXES: @@ -228,10 +226,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) +install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -254,18 +252,18 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) } \ ; done -uninstall-dist_binSCRIPTS: +uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files -install-man1: $(dist_man1_MANS) +install-man1: $(man1_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ { for i in $$list; do echo "$$i"; done; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ @@ -289,7 +287,7 @@ install-man1: $(dist_man1_MANS) uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ @@ -618,7 +616,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-dist_binSCRIPTS +install-exec-am: install-binSCRIPTS install-html: install-html-am @@ -658,7 +656,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_binSCRIPTS uninstall-man +uninstall-am: uninstall-binSCRIPTS uninstall-man uninstall-man: uninstall-man1 @@ -669,15 +667,14 @@ uninstall-man: uninstall-man1 dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-generic distcleancheck distdir distuninstallcheck \ dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_binSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-man1 install-pdf install-pdf-am install-ps \ + install-binSCRIPTS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-dist_binSCRIPTS uninstall-man \ - uninstall-man1 + uninstall-am uninstall-binSCRIPTS uninstall-man uninstall-man1 doc: $(pdf_files) |