diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-18 13:33:20 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-18 13:33:20 +0000 |
commit | 793906fc9c8212552f260f828417697e8d6988cb (patch) | |
tree | c482f184dd4f8051fabbb93d9a5deb9eb3c5558f /Build/source/texk | |
parent | 8e31e7e6203fe17faed3ff44046dc99d9ce31779 (diff) |
build system: cleanup xindy, remove some unused files
git-svn-id: svn://tug.org/texlive/trunk@13202 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/Makefile.am | 14 | ||||
-rw-r--r-- | Build/source/texk/Makefile.in | 8 | ||||
-rwxr-xr-x | Build/source/texk/configure | 13 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/Makefile.in | 2 |
5 files changed, 23 insertions, 18 deletions
diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am index 1345991963f..f5f20ba7c95 100644 --- a/Build/source/texk/Makefile.am +++ b/Build/source/texk/Makefile.am @@ -22,13 +22,13 @@ DISTCLEANFILES = $(noinst_DATA) all-local: subtexk .PHONY: subtexk -## We must configure all texk subdirs since 'make dist' needs the Makefile. -## For those not required for the current set of configure options -## we append '--disable-build' so they can skip tests that would -## fail because, e.g., some libraries were not built. - -## Sequentially configure and optionally build all texk subdirs; -## code inspired by automake's way to handle recursive targets. +# We must configure all texk subdirs since 'make dist' needs the Makefile. +# For those not required for the current set of configure options +# we append '--disable-build' so they can skip tests that would +# fail because, e.g., some required libraries were not built. +# +# Sequentially configure and optionally build all texk subdirs; +# code inspired by automake's way to handle recursive targets. subtexk: $(noinst_DATA) @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 869650da7ce..86f31f14036 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -672,7 +672,13 @@ dist-hook: all-local: subtexk .PHONY: subtexk - +# We must configure all texk subdirs since 'make dist' needs the Makefile. +# For those not required for the current set of configure options +# we append '--disable-build' so they can skip tests that would +# fail because, e.g., some required libraries were not built. +# +# Sequentially configure and optionally build all texk subdirs; +# code inspired by automake's way to handle recursive targets. subtexk: $(noinst_DATA) @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 9b24285ab9d..da8600f180a 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -693,7 +693,7 @@ enable_t1utils enable_tpic2pdftex enable_vlna enable_xindy -enable_xindy_make_rules +enable_xindy_rules enable_xindy_docs with_xindy_recode enable_web2c @@ -1478,9 +1478,8 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --enable-xindy build the xindy package - --enable-xindy-make-rules build and install make-rules package (default is - YES) - --enable-xindy-docs build and install documentation (default is YES) + --enable-xindy-rules build and install make-rules package + --enable-xindy-docs build and install documentation --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -2363,9 +2362,9 @@ esac ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ ## configure options for xindy -# Check whether --enable-xindy-make-rules was given. -if test "${enable_xindy_make_rules+set}" = set; then - enableval=$enable_xindy_make_rules; +# Check whether --enable-xindy-rules was given. +if test "${enable_xindy_rules+set}" = set; then + enableval=$enable_xindy_rules; fi # Check whether --enable-xindy-docs was given. if test "${enable_xindy_docs+set}" = set; then diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 8a895450133..3c9ebbc1bd3 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -11,19 +11,19 @@ bin_SCRIPTS = ## Copies of these scripts exist here for the sake of avoiding ## dangling symlinks produced by `make install'. -## The instances in texmf* or are the masters (except when it is CTAN). +## The instances in texmf* are the masters (except when it is CTAN). scriptxdir = ${prefix}/texmf/scripts nobase_dist_scriptx_SCRIPTS = \ a2ping/a2ping.pl \ epstopdf/epstopdf.pl \ + getnonfreefonts/getnonfreefonts.pl \ pkfix/pkfix.pl \ ps2eps/ps2eps.pl \ simpdftex/simpdftex \ tetex/e2pall.pl \ tetex/texdoctk.pl \ texdoc/texdoc.tlu \ - getnonfreefonts/getnonfreefonts.pl \ texlive/rungs.tlu \ texlive/tlmgr.pl diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 32035ed878b..62abe7bf2ef 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -145,13 +145,13 @@ scriptxdir = ${prefix}/texmf/scripts nobase_dist_scriptx_SCRIPTS = \ a2ping/a2ping.pl \ epstopdf/epstopdf.pl \ + getnonfreefonts/getnonfreefonts.pl \ pkfix/pkfix.pl \ ps2eps/ps2eps.pl \ simpdftex/simpdftex \ tetex/e2pall.pl \ tetex/texdoctk.pl \ texdoc/texdoc.tlu \ - getnonfreefonts/getnonfreefonts.pl \ texlive/rungs.tlu \ texlive/tlmgr.pl |