diff options
author | Karl Berry <karl@freefriends.org> | 2008-04-29 18:25:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-04-29 18:25:18 +0000 |
commit | 37b8defbcb47d1681a0b7bb8711751072cd5aa98 (patch) | |
tree | 471d7d2740a8dd1b3036f917af059d000f32da13 /Build/source/texk/dvipsk | |
parent | b82ce2afd3abfc19d2887b025b1d95799016e7f5 (diff) |
do not cd ($srcdir) in any rule, fails when install program is a relative path (from vvv)
git-svn-id: svn://tug.org/texlive/trunk@7730 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/Makefile.in | 34 |
2 files changed, 9 insertions, 30 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 73273889cd6..86a37b83489 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,6 +1,9 @@ 2008-04-29 Karl Berry <karl@tug.org> - * squeeze.c: avoid all old-sytem conditionals, linking with + * Makefile.in (install-data): do not cd $(srcdir) in any rule, + that fails when the install program is specified by a relative path. + + * squeeze.c: avoid all old-system conditionals, linking with kpathsea, etc. 2008-04-28 Karl Berry <karl@tug.org> diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index b6cc5d1d15c..31fd966ce1c 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -97,36 +97,21 @@ uninstall-exec: for p in $(programs); do rm -f $(bindir)/$$p; done rm -f $(bindir)/o$(program) +# config.ps, encoding files, etc., are not installed here, since they +# need to go through the usual package mechanism. install-data: $(program).info $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(infodir) $(psheaderdir)/base # PostScript prologues and encodings. for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done -# cd $(srcdir)/reencode && \ -# for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done -# config.ps. Any one config.ps will be wrong for most people, so don't -# install anything by default. -# if test ! -r $(psheaderdir)/base/config.ps \ -# || grep 'original config.ps --' $(psheaderdir)/base/config.ps \ -# >/dev/null; then \ -# $(INSTALL_DATA) $(srcdir)/config.ps $(psheaderdir)/base/config.ps; \ -# else true; fi -# psfonts.map. -# if test ! -r $(psheaderdir)/base/psfonts.map \ -# || grep 'original psfonts.map --' $(psheaderdir)/base/psfonts.map \ -# >/dev/null; then \ -# $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \ -# else true; fi # Info files. - cd $(srcdir) && for i in $(program).i*; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i; done + test -r ./$(program).info \ + || $(INSTALL_DATA) $(srcdir)/$(program).i* $(infodir)/ # Man pages. $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext) rm -f $(man1dir)/o$(program).$(manext) ln -s $(program).$(manext) $(man1dir)/o$(program).$(manext) $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(man1dir)/afm2tfm.$(manext) -# TeX macros. -# cd $(srcdir)/tex && for m in *.tex; do \ -# $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done +# Post. $(POST_INSTALL) if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ install-info --info-dir=$(infodir) $(infodir)/$(program).info; \ @@ -139,15 +124,6 @@ uninstall-data: else true; fi $(NORMAL_UNINSTALL) rm -f $(infodir)/dvips.i* -# for h in $(prologues); do rm -f $(psheaderdir)/base/$$h; done -# cd $(srcdir)/reencode && for e in *.enc; do rm -f $(psheaderdir)/base/$$e; \ -# done -# if grep 'original config.ps --' $(psheaderdir)/base/config.ps \ -# >/dev/null 2>&1; then rm -f $(psheaderdir)/base/config.ps; \ -# else true; fi -# if grep 'original psfonts.map --' $(psheaderdir)/base/psfonts.map \ -# >/dev/null 2>&1; then rm -f $(psheaderdir)/base/psfonts.map; \ -# else true; fi rm -f $(man1dir)/dvips.$(manext) $(man1dir)/afm2tfm.$(manext) distname = dvipsk |