$NetBSD: patch-aa,v 1.8 2011/11/06 09:20:41 minskim Exp $

--- Makefile.in.orig	2011-06-16 14:01:09.000000000 +0000
+++ Makefile.in
@@ -195,11 +195,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-perl_scripts = \
-	updmap
+perl_scripts =
 
-shell_scripts = \
-	updmap-sys
+shell_scripts =
 
 sh_scripts = \
 	allcm \
@@ -226,7 +224,7 @@ all_scripts = $(lua_scripts) $(perl_scri
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = ${prefix}/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
+dist_texmf_SCRIPTS =
 @WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts)
 CLEANFILES = $(nodist_bin_SCRIPTS)
 dist_man1_MANS = \
@@ -235,7 +233,6 @@ dist_man1_MANS = \
 	allneeded.man \
 	dvi2fax.man \
 	dvired.man \
-	e2pall.man \
 	fmtutil.man \
 	fontinst.man \
 	kpsetool.man \
@@ -247,14 +244,12 @@ dist_man1_MANS = \
 	texconfig.man \
 	texdoctk.man \
 	texlinks.man \
-	thumbpdf.man \
-	updmap.man
+	thumbpdf.man
 
 dist_man5_MANS = \
-	fmtutil.cnf.5 \
-	updmap.cfg.5
+	fmtutil.cnf.5
 
-texconfdir = ${prefix}
+texconfdir = ${prefix}/share
 nobase_dist_texconf_DATA = \
 	texmf/texconfig/README \
 	texmf/texconfig/g/generic \
@@ -262,7 +257,7 @@ nobase_dist_texconf_DATA = \
 	texmf/texconfig/v/vt100 \
 	texmf/texconfig/x/xterm
 
-texconfigdir = ${prefix}/texmf/texconfig
+texconfigdir = ${prefix}/share/texmf/texconfig
 dist_texconfig_SCRIPTS = tcfmgr
 dist_texconfig_DATA = tcfmgr.map
 web2cdir = ${prefix}/texmf/web2c
@@ -275,8 +270,7 @@ bin_links = \
 
 man1_links = $(bin_links) \
 	fmtutil:fmtutil-sys \
-	texconfig:texconfig-sys \
-	updmap:updmap-sys
+	texconfig:texconfig-sys
 
 EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap
 run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
@@ -810,7 +804,7 @@ info-am:
 
 install-data-am: install-dist_texconfigDATA \
 	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
-	install-dist_web2cDATA install-man \
+	install-man \
 	install-nobase_dist_texconfDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
