$NetBSD: patch-aa,v 1.3 2006/11/27 14:32:24 hira Exp $

--- texk/web2c/ptex-src-3.1.9/Makefile.in.orig	2005-03-07 15:30:44.000000000 +0900
+++ texk/web2c/ptex-src-3.1.9/Makefile.in	2006-11-27 19:12:16.000000000 +0900
@@ -5,12 +5,18 @@
 
 default: programs formats
 
-programs=ptex tftopl pltotf pdvitype jbibtex
+programs=ptex ptftopl ppltotf pdvitype pjbibtex
 euc-formats=ptex-euc.fmt platex-euc.fmt
 sjis-formats=ptex-sjis.fmt platex-sjis.fmt
 
 ac_include ../../make/paths.mk
 
+#
+texmflcl = @texmflocal@
+web2c_lcl_dir = $(texmflcl)/web2c
+fmt_lcl_dir = $(web2c_lcl_dir)
+texpool_lcl_dir = $(web2c_lcl_dir)
+
 # Used for triptrap.
 DIFF = diff
 DIFFFLAGS =
@@ -94,6 +100,9 @@
 	$(srcdir)/tie -c ptex.ch ptex.web ptex-base.ch
 
 ### TFtoPL
+ptftopl: tftopl
+	rm -f pftopl
+	$(LN) tftopl ptftopl
 tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib)
 	$(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES)
 tftopl.o: tftopl.c kanji.h ptexhelp.h
@@ -105,6 +114,9 @@
 
 
 ### PLtoTF
+ppltotf: pltotf
+	rm -f ppltotf
+	$(LN) pltotf ppltotf
 pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib)
 	$(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
 pltotf.o: pltotf.c kanji.h ptexhelp.h
@@ -126,6 +138,9 @@
 	$(LN) $(srcdir)/dvitype.web pdvitype.web
 
 ### jBibTeX
+pjbibtex: jbibtex
+	rm -f pjbibtex
+	$(LN) jbibtex pjbibtex
 jbibtex: jbibtex.o jbibextra.o $(plib_o) $(kpathsea) $(proglib)
 	$(kpathsea_link) jbibtex.o jbibextra.o $(plib_o) $(LOADLIBES)
 jbibextra.o: jbibextra.c jbibd.h kanji.h ptexhelp.h
@@ -168,11 +183,16 @@
 texmf.cnf: $(kpathsea_dir)/texmf.cnf
 	$(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
 
-dumpenv = TEXMFCNF=$(thisdir)
+#dumpenv = TEXMFCNF=$(thisdir)
+newtexmf = $(srcdir)/../../texmf
+newtexmflcl = $(srcdir)/../../texmf-local
+texin = $(srcdir):{$(newtexmf),$(newtexmflcl)}/ptex//
+texfonts = {$(newtexmf),$(newtexmflcl)}/fonts/tfm/ptex//
+dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts):
 
 ptex-euc.fmt: ptex texmf.cnf
 	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
-	$(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null
+	$(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null || ${TRUE} # XXX
 
 ptex-sjis.fmt: ptex texmf.cnf
 	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
@@ -180,7 +200,7 @@
 
 platex-euc.fmt: ptex texmf.cnf
 	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
-	$(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null
+	$(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null || ${TRUE} # XXX
 
 platex-sjis.fmt: ptex texmf.cnf
 	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
@@ -207,7 +227,6 @@
 
 # 
 install: install-exec install-data
-	$(top_srcdir)/kpathsea/mktexlsr
 install-exec:: install-links
 install-data:: install-formats
 
@@ -216,6 +235,8 @@
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
 $(web2cdir)::
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir)
+$(fmt_lcl_dir)::
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(fmt_lcl_dir)
 
 # The actual binary executables and pool files.
 install-programs: $(programs) $(bindir)
@@ -226,23 +247,24 @@
 	cd $(bindir) && (rm -f iniptex virptex platex; $(LN) ptex platex)
 
 # Always do plain.*, so examples from the TeXbook (etc.) will work.
-install-formats: $(formats) $(web2cdir)
-	for f in $(formats); do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
-	cd $(web2cdir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
+install-formats: $(formats) $(fmt_lcl_dir)
+	for f in $(formats); do $(INSTALL_DATA) $$f $(fmt_lcl_dir)/$$f; done
+	cd $(fmt_lcl_dir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
 		$(LN) ptex-euc.fmt ptex-jis.fmt ;\
 		$(LN) platex-euc.fmt platex-jis.fmt)
-	cd $(web2cdir) && (rm -f ptex.fmt platex.fmt ;\
+	cd $(fmt_lcl_dir) && (rm -f ptex.fmt platex.fmt ;\
 		$(LN) ptex-$(configkcode).fmt ptex.fmt ;\
 		$(LN) platex-$(configkcode).fmt platex.fmt )
 
 # Auxiliary files.
 install-data::
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir)
-	$(INSTALL_DATA) ptex.pool $(web2cdir)/ptex.pool
-	if [ -f $(web2cdir)/texmf.cnf ]; then \
-		mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
-	else true; fi
-	$(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf
+	$(SHELL) $(top_srcdir)/mkinstalldirs \
+		$(texpool_lcl_dir) $(web2c_lcl_dir)
+	$(INSTALL_DATA) ptex.pool $(texpool_lcl_dir)/ptex.pool
+#	if [ -f $(web2cdir)/texmf.cnf ]; then \
+#		mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
+#	else true; fi
+	$(INSTALL_DATA) texmf.cnf $(web2c_lcl_dir)/texmf.cnf
 # 
 # Testing, including triptrap. The `x' filenames are for output.
 check: pltotf-check tftopl-check pooltype-check ptex-check