depend on stamp-paths instead of recursing to create it

git-svn-id: svn://tug.org/texlive/trunk@13037 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 32 insertions, 7 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 1796dc5f549..a1db4b1fd87 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,18 @@
+2009-05-11  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (paths.h): depend on stamp-paths, instead of
+	recursively invoking it.  Else it does not get invoked once it is
+	created.
+
+2009-05-11  Karl Berry  <karl@tug.org>
+
+	* types.h (kpse_file_format_type): add kpse_fea_format,
+	kpse_cid_format for Hans/Taco.
+	* texmf.cnf: define default paths (fonts/fea// and fonts/cid//).
+	* tex-file.c (kpathsea_init_format): initialize them.
+	Also, for kpse_enc_format, set suffix_search_only=true.
+	* doc/kpathsea.texi: document this.
+
 2009-04-18  Karl Berry  <karl@tug.org>
 
 	* texmf.cnf (shell_escape_commands): add fc-match, request
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index bac787dcca0..2f3c7bfa224 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -182,8 +182,7 @@ $(kpseinclude_HEADERS): paths.h
 ## We also replace all semicolons with colons in the paths.
 ## The path-splitting code should be changed to understand both.
 #
-paths.h:
-	$(MAKE) $(AM_MAKE_FLAGS) stamp-paths
+paths.h: stamp-paths
 stamp-paths: texmf.cnf
 	echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
 	sed -e 's/%.*//' -e 's/^[ 	]*//' -e 's/[ 	]*$$//' $< \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 95b3b4ddbf7..17e6a74c726 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -1544,8 +1544,7 @@ $(kpseinclude_HEADERS): paths.h
 #
 #
 #
-paths.h:
-	$(MAKE) $(AM_MAKE_FLAGS) stamp-paths
+paths.h: stamp-paths
 stamp-paths: texmf.cnf
 	echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
 	sed -e 's/%.*//' -e 's/^[ 	]*//' -e 's/[ 	]*$$//' $< \
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index 82c1278202f..0b628fbec1d 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -226,10 +226,16 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(nodist_man1_MANS)
+install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(nodist_man1_MANS)'; \
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
 	for i in $$list; do \
 	  if test -f $$i; then file=$$i; \
 	  else file=$(srcdir)/$$i; fi; \
@@ -246,7 +252,13 @@ install-man1: $(nodist_man1_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_man1_MANS)'; \
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \