diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/Makefile.in | 34 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 7 | ||||
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/doc/Makefile.in | 5 |
6 files changed, 26 insertions, 35 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 diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index d91bbfd978d..5c7261320e2 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2008-04-29 Karl Berry <karl@tug.org> + + * Makefile.in (install-data): do not cd $(srcdir) in any rule, + that fails when the install program is specified by a relative path. + 2008-03-27 Karl Berry <karl@tug.org> * tex-make.c: start "running" on a new line, tweak other msgs. diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 5452419a744..89a51f74879 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -202,16 +202,17 @@ install-data: texmf.cnf kpathsea.info install-man || test ! -r $(web2cdir)/texmf.cnf; then \ $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \ else true; fi - test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i; done +# Info files. + test -r ./kpathsea.info \ + || $(INSTALL_DATA) $(srcdir)/kpathsea.i* $(infodir)/ # Should we install the headers? They are not just system-dependent, # which is bad enough, but even compiler-dependent. $(SHELL) $(top_srcdir)/../mkinstalldirs $(includedir)/kpathsea for f in $(install_headers); do \ $(INSTALL_DATA) $$f $(includedir)/kpathsea/; done rm -f $(includedir)/kpathsea/acconfig.h +# Post. $(POST_INSTALL) - test -r $(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir $(infodir) if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ install-info --info-dir=$(infodir) $(infodir)/kpathsea.info; \ else true; fi diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 7609c3dab45..f9939b96adf 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2008-04-29 Karl Berry <karl@tug.org> + + * doc/Makefile.in (install-data): do not cd $(srcdir) in any rule, + that fails when the install program is specified by a relative path. + 2008-04-28 Karl Berry <karl@tug.org> * fmtutil.in: disable cont-en, texexec et al. create it. diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 7c20d08d7f9..860d44b01c4 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -50,8 +50,9 @@ install: install-exec install-data install-exec: install-data: web2c.info $(SHELL) $(top_srcdir)/../mkinstalldirs $(infodir) - test -r ./web2c.info || cd $(srcdir) && for i in web2c.i*; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i; done + test -r ./web2c.info \ + || $(INSTALL_DATA) $(srcdir)/web2c.i* $(infodir)/ +# $(POST_INSTALL) if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ install-info --info-dir=$(infodir) $(infodir)/web2c.info; \ |