| @@ -1,72 +1,81 @@ | | | @@ -1,72 +1,81 @@ |
1 | $NetBSD: patch-aa,v 1.7 2011/11/06 08:43:29 minskim Exp $ | | 1 | $NetBSD: patch-aa,v 1.8 2011/11/06 09:20:41 minskim Exp $ |
2 | | | 2 | |
3 | --- Makefile.in.orig 2011-06-16 14:01:09.000000000 +0000 | | 3 | --- Makefile.in.orig 2011-06-16 14:01:09.000000000 +0000 |
4 | +++ Makefile.in | | 4 | +++ Makefile.in |
5 | @@ -195,11 +195,9 @@ top_build_prefix = @top_build_prefix@ | | 5 | @@ -195,11 +195,9 @@ top_build_prefix = @top_build_prefix@ |
6 | top_builddir = @top_builddir@ | | 6 | top_builddir = @top_builddir@ |
7 | top_srcdir = @top_srcdir@ | | 7 | top_srcdir = @top_srcdir@ |
8 | ACLOCAL_AMFLAGS = -I ../../m4 | | 8 | ACLOCAL_AMFLAGS = -I ../../m4 |
9 | -perl_scripts = \ | | 9 | -perl_scripts = \ |
10 | - updmap | | 10 | - updmap |
11 | +perl_scripts = | | 11 | +perl_scripts = |
12 | | | 12 | |
13 | -shell_scripts = \ | | 13 | -shell_scripts = \ |
14 | - updmap-sys | | 14 | - updmap-sys |
15 | +shell_scripts = | | 15 | +shell_scripts = |
16 | | | 16 | |
17 | sh_scripts = \ | | 17 | sh_scripts = \ |
18 | allcm \ | | 18 | allcm \ |
| | | 19 | @@ -226,7 +224,7 @@ all_scripts = $(lua_scripts) $(perl_scri |
| | | 20 | @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) |
| | | 21 | @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe |
| | | 22 | texmfdir = ${prefix}/$(scriptsdir) |
| | | 23 | -dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) |
| | | 24 | +dist_texmf_SCRIPTS = |
| | | 25 | @WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts) |
| | | 26 | CLEANFILES = $(nodist_bin_SCRIPTS) |
| | | 27 | dist_man1_MANS = \ |
19 | @@ -235,7 +233,6 @@ dist_man1_MANS = \ | | 28 | @@ -235,7 +233,6 @@ dist_man1_MANS = \ |
20 | allneeded.man \ | | 29 | allneeded.man \ |
21 | dvi2fax.man \ | | 30 | dvi2fax.man \ |
22 | dvired.man \ | | 31 | dvired.man \ |
23 | - e2pall.man \ | | 32 | - e2pall.man \ |
24 | fmtutil.man \ | | 33 | fmtutil.man \ |
25 | fontinst.man \ | | 34 | fontinst.man \ |
26 | kpsetool.man \ | | 35 | kpsetool.man \ |
27 | @@ -247,14 +244,12 @@ dist_man1_MANS = \ | | 36 | @@ -247,14 +244,12 @@ dist_man1_MANS = \ |
28 | texconfig.man \ | | 37 | texconfig.man \ |
29 | texdoctk.man \ | | 38 | texdoctk.man \ |
30 | texlinks.man \ | | 39 | texlinks.man \ |
31 | - thumbpdf.man \ | | 40 | - thumbpdf.man \ |
32 | - updmap.man | | 41 | - updmap.man |
33 | + thumbpdf.man | | 42 | + thumbpdf.man |
34 | | | 43 | |
35 | dist_man5_MANS = \ | | 44 | dist_man5_MANS = \ |
36 | - fmtutil.cnf.5 \ | | 45 | - fmtutil.cnf.5 \ |
37 | - updmap.cfg.5 | | 46 | - updmap.cfg.5 |
38 | + fmtutil.cnf.5 | | 47 | + fmtutil.cnf.5 |
39 | | | 48 | |
40 | -texconfdir = ${prefix} | | 49 | -texconfdir = ${prefix} |
41 | +texconfdir = ${prefix}/share | | 50 | +texconfdir = ${prefix}/share |
42 | nobase_dist_texconf_DATA = \ | | 51 | nobase_dist_texconf_DATA = \ |
43 | texmf/texconfig/README \ | | 52 | texmf/texconfig/README \ |
44 | texmf/texconfig/g/generic \ | | 53 | texmf/texconfig/g/generic \ |
45 | @@ -262,7 +257,7 @@ nobase_dist_texconf_DATA = \ | | 54 | @@ -262,7 +257,7 @@ nobase_dist_texconf_DATA = \ |
46 | texmf/texconfig/v/vt100 \ | | 55 | texmf/texconfig/v/vt100 \ |
47 | texmf/texconfig/x/xterm | | 56 | texmf/texconfig/x/xterm |
48 | | | 57 | |
49 | -texconfigdir = ${prefix}/texmf/texconfig | | 58 | -texconfigdir = ${prefix}/texmf/texconfig |
50 | +texconfigdir = ${prefix}/share/texmf/texconfig | | 59 | +texconfigdir = ${prefix}/share/texmf/texconfig |
51 | dist_texconfig_SCRIPTS = tcfmgr | | 60 | dist_texconfig_SCRIPTS = tcfmgr |
52 | dist_texconfig_DATA = tcfmgr.map | | 61 | dist_texconfig_DATA = tcfmgr.map |
53 | web2cdir = ${prefix}/texmf/web2c | | 62 | web2cdir = ${prefix}/texmf/web2c |
54 | @@ -275,8 +270,7 @@ bin_links = \ | | 63 | @@ -275,8 +270,7 @@ bin_links = \ |
55 | | | 64 | |
56 | man1_links = $(bin_links) \ | | 65 | man1_links = $(bin_links) \ |
57 | fmtutil:fmtutil-sys \ | | 66 | fmtutil:fmtutil-sys \ |
58 | - texconfig:texconfig-sys \ | | 67 | - texconfig:texconfig-sys \ |
59 | - updmap:updmap-sys | | 68 | - updmap:updmap-sys |
60 | + texconfig:texconfig-sys | | 69 | + texconfig:texconfig-sys |
61 | | | 70 | |
62 | EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap | | 71 | EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap |
63 | run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ | | 72 | run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ |
64 | @@ -810,7 +804,7 @@ info-am: | | 73 | @@ -810,7 +804,7 @@ info-am: |
65 | | | 74 | |
66 | install-data-am: install-dist_texconfigDATA \ | | 75 | install-data-am: install-dist_texconfigDATA \ |
67 | install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \ | | 76 | install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \ |
68 | - install-dist_web2cDATA install-man \ | | 77 | - install-dist_web2cDATA install-man \ |
69 | + install-man \ | | 78 | + install-man \ |
70 | install-nobase_dist_texconfDATA | | 79 | install-nobase_dist_texconfDATA |
71 | @$(NORMAL_INSTALL) | | 80 | @$(NORMAL_INSTALL) |
72 | $(MAKE) $(AM_MAKEFLAGS) install-data-hook | | 81 | $(MAKE) $(AM_MAKEFLAGS) install-data-hook |