From be2d7d96f620affad0820e13fa4bafa7a96b1596 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 9 Aug 2012 09:47:38 +0000 Subject: build system: Various minor fixes git-svn-id: svn://tug.org/texlive/trunk@27352 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/win32/ChangeLog | 4 ++++ Build/source/texk/kpathsea/win32/Makefile.am | 6 ++++++ Build/source/texk/kpathsea/win32/Makefile.in | 25 +++++++++++++++++-------- 3 files changed, 27 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/kpathsea/win32') diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog index 9905eb0b95a..feac8b70271 100644 --- a/Build/source/texk/kpathsea/win32/ChangeLog +++ b/Build/source/texk/kpathsea/win32/ChangeLog @@ -1,3 +1,7 @@ +2012-08-08 Peter Breitenlohner + + * Makefile.am: Install texhash.exe as copy of mktexlsr.exe. + 2012-08-03 Peter Breitenlohner * mktexfmt.c, mktexpk.c, mktextfm.c: Replace P_WAIT by _P_WAIT. diff --git a/Build/source/texk/kpathsea/win32/Makefile.am b/Build/source/texk/kpathsea/win32/Makefile.am index 1e0614ac519..ddc8763fe19 100644 --- a/Build/source/texk/kpathsea/win32/Makefile.am +++ b/Build/source/texk/kpathsea/win32/Makefile.am @@ -66,6 +66,12 @@ mktexupd_SOURCES = \ LDADD = ../libkpathsea.la +install-exec-hook: + cp -p $(DESTDIR)$(bindir)/mktexlsr$(EXEEXT) $(DESTDIR)$(bindir)/texhash$(EXEEXT) + +uninstall-hook: + rm -f $(DESTDIR)$(bindir)/texhash$(EXEEXT) + ## Rebuild libkpathsea ../libkpathsea.la: ${top_srcdir}/../kpathsea/*.[ch] ../paths.h cd .. && $(MAKE) $(AM_MAKEFLAGS) rebuild diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in index fe287be753e..c58a778eb5e 100644 --- a/Build/source/texk/kpathsea/win32/Makefile.in +++ b/Build/source/texk/kpathsea/win32/Makefile.in @@ -616,7 +616,8 @@ install-dvi: install-dvi-am install-dvi-am: install-exec-am: install-binPROGRAMS - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-am install-html-am: @@ -656,8 +657,9 @@ ps: ps-am ps-am: uninstall-am: uninstall-binPROGRAMS - -.MAKE: install-am install-strip + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: install-am install-exec-am install-strip uninstall-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool cscopelist ctags distclean \ @@ -665,14 +667,21 @@ uninstall-am: uninstall-binPROGRAMS distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS 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-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook + + +install-exec-hook: + cp -p $(DESTDIR)$(bindir)/mktexlsr$(EXEEXT) $(DESTDIR)$(bindir)/texhash$(EXEEXT) +uninstall-hook: + rm -f $(DESTDIR)$(bindir)/texhash$(EXEEXT) ../libkpathsea.la: ${top_srcdir}/../kpathsea/*.[ch] ../paths.h cd .. && $(MAKE) $(AM_MAKEFLAGS) rebuild -- cgit v1.2.3