From 86f8708d1f582b3ceee54772cc03c70e099598c0 Mon Sep 17 00:00:00 2001 From: Vladimir Volovich Date: Sun, 20 Apr 2008 04:25:01 +0000 Subject: simplify Makefiles (mostly remove the need to have TETEX_BUILD-specific sections) git-svn-id: svn://tug.org/texlive/trunk@7537 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/binaries/Makefile.am | 28 +++++++++------------- Build/source/utils/xindy/configure.ac | 1 + .../utils/xindy/make-rules/alphabets/Makefile.am | 6 +---- .../utils/xindy/make-rules/inputenc/Makefile.am | 8 +------ .../utils/xindy/make-rules/styles/Makefile.am | 8 +------ Build/source/utils/xindy/modules/base/Makefile.am | 8 +------ Build/source/utils/xindy/modules/class/Makefile.am | 11 ++------- .../utils/xindy/modules/lang/german/Makefile.am | 13 ++-------- .../utils/xindy/modules/lang/latin/Makefile.am | 12 ++-------- Build/source/utils/xindy/modules/ord/Makefile.am | 11 ++------- Build/source/utils/xindy/modules/rules/Makefile.am | 8 +------ .../source/utils/xindy/modules/styles/Makefile.am | 8 +------ 12 files changed, 26 insertions(+), 96 deletions(-) (limited to 'Build/source') diff --git a/Build/source/utils/xindy/binaries/Makefile.am b/Build/source/utils/xindy/binaries/Makefile.am index dd519c1a336..bfa582e5c41 100644 --- a/Build/source/utils/xindy/binaries/Makefile.am +++ b/Build/source/utils/xindy/binaries/Makefile.am @@ -23,34 +23,28 @@ # some global variables SRCDIR = $(top_srcdir)/src FAS = base.fas locref.fas idxstyle.fas index.fas version.fas markup.fas -DEFAULTS = defaults.xdy DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp -MEMFILE = xindy.mem RUN_XINDY = ./$(XINDY_RUN) -q -norc -M ./base.mem if TETEX_BUILD - MODULEDIR = $(prefix)/texmf/xindy kerneldir = $(bindir) else -# Where the modules are found at runtime. - MODULEDIR = $(pkgdatadir) # Where the files xindy.run and xindy.mem should be installed. kerneldir = $(pkglibdir) endif -xindy.mem: $(DEFAULTS) $(FAS) base.mem $(XINDY_RUN) - rm -f $(MEMFILE) +xindy.mem: defaults.xdy $(FAS) base.mem $(XINDY_RUN) + rm -f $@ $(RUN_XINDY) -x '(load "$(DUMP_XINDY)")' - gzip $(MEMFILE) - mv $(MEMFILE).gz $(MEMFILE) - -$(DEFAULTS): - @$(RM) $(DEFAULTS) - @echo "Creating file $(DEFAULTS)..." - @echo "(setq *load-paths* (list " > $(DEFAULTS) - @echo " (pathname \".\")" >> $(DEFAULTS) - @echo " (pathname \"$(MODULEDIR)\")))" >> $(DEFAULTS) - @echo "Finished $(DEFAULTS)." + test "$(host_os)" != "mingw32" && gzip -9n $@ && mv $@.gz $@ + +defaults.xdy: + @$(RM) $@ + @echo "Creating file $@ ..." + @echo "(setq *load-paths* (list " > $@ + @echo " (pathname \".\")" >> $@ + @echo " (pathname \"$(pkgdatadir)\")))" >> $@ + @echo "Finished $@." %.fas: $(SRCDIR)/%.lsp $(RUN_XINDY) -c $< -o $@ diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index d6700878921..530a6397448 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -42,6 +42,7 @@ AC_ARG_WITH(clisp, AS_HELP_STRING([--with-clisp=...],[Use the specified location if test "x$enable_tetex_build" = xyes; then dnl we don't really care whether $srcdir/../../texk/kpathsea is found, so don't test for it. AC_MSG_NOTICE([Using installation layout for TeX Live]) + datadir="$prefix/texmf" docdir="$prefix/texmf/doc/$PACKAGE_NAME" mandir="$prefix/texmf/doc/man" if test -z "$enable_docs"; then diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am index 315cde53dee..24543bc4c93 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am @@ -19,11 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - langdir = $(prefix)/texmf/xindy/lang -else - langdir = $(pkgdatadir)/lang -endif +langdir = $(pkgdatadir)/lang albaniandir = $(langdir)/albanian diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am index 84575312d7c..dbeb5686b58 100644 --- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am +++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am @@ -19,13 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif - -inputencdir = $(modulesdir)/tex/inputenc +inputencdir = $(pkgdatadir)/tex/inputenc INPUTENCS = \ cp1250.xdy \ diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.am b/Build/source/utils/xindy/make-rules/styles/Makefile.am index 22a085d124e..5ccefe3c7b4 100644 --- a/Build/source/utils/xindy/make-rules/styles/Makefile.am +++ b/Build/source/utils/xindy/make-rules/styles/Makefile.am @@ -19,13 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif - -stylesdir = $(modulesdir)/styles +stylesdir = $(pkgdatadir)/styles STYLES = \ example.xdy \ diff --git a/Build/source/utils/xindy/modules/base/Makefile.am b/Build/source/utils/xindy/modules/base/Makefile.am index 2d5a7df3637..a4d006cb135 100644 --- a/Build/source/utils/xindy/modules/base/Makefile.am +++ b/Build/source/utils/xindy/modules/base/Makefile.am @@ -19,13 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif - -basedir = $(modulesdir)/base +basedir = $(pkgdatadir)/base RULES = \ book-order.xdy \ diff --git a/Build/source/utils/xindy/modules/class/Makefile.am b/Build/source/utils/xindy/modules/class/Makefile.am index 4d7f765598f..151f9c95505 100644 --- a/Build/source/utils/xindy/modules/class/Makefile.am +++ b/Build/source/utils/xindy/modules/class/Makefile.am @@ -19,16 +19,9 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif +classdir = $(pkgdatadir)/class -classdir = $(modulesdir)/class - -RULES = \ - pagenums.xdy +RULES = pagenums.xdy EXTRA_DIST = $(RULES) diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.am b/Build/source/utils/xindy/modules/lang/german/Makefile.am index 112bd08545f..252b9b665fe 100644 --- a/Build/source/utils/xindy/modules/lang/german/Makefile.am +++ b/Build/source/utils/xindy/modules/lang/german/Makefile.am @@ -19,18 +19,9 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - langdir = $(prefix)/texmf/xindy/lang -else - langdir = $(pkgdatadir)/lang -endif +germandir = $(pkgdatadir)/lang/german -germandir = $(langdir)/german - -RULES = \ - din5007.xdy \ - duden.xdy \ - tex.xdy +RULES = din5007.xdy duden.xdy tex.xdy EXTRA_DIST = $(RULES) diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.am b/Build/source/utils/xindy/modules/lang/latin/Makefile.am index 7224166f855..686c8c744b4 100644 --- a/Build/source/utils/xindy/modules/lang/latin/Makefile.am +++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.am @@ -19,17 +19,9 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - langdir = $(prefix)/texmf/xindy/lang -else - langdir = $(pkgdatadir)/lang -endif +latindir = $(pkgdatadir)/lang/latin -latindir = $(langdir)/latin - -RULES = \ - caseisrt.xdy \ - letgroup.xdy +RULES = caseisrt.xdy letgroup.xdy EXTRA_DIST = $(RULES) diff --git a/Build/source/utils/xindy/modules/ord/Makefile.am b/Build/source/utils/xindy/modules/ord/Makefile.am index 17dc444cfae..05548ad593c 100644 --- a/Build/source/utils/xindy/modules/ord/Makefile.am +++ b/Build/source/utils/xindy/modules/ord/Makefile.am @@ -19,16 +19,9 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif +orddir = $(pkgdatadir)/ord -orddir = $(modulesdir)/ord - -RULES = \ - letorder.xdy +RULES = letorder.xdy EXTRA_DIST = $(RULES) diff --git a/Build/source/utils/xindy/modules/rules/Makefile.am b/Build/source/utils/xindy/modules/rules/Makefile.am index b420ad007d4..aec5008efbd 100644 --- a/Build/source/utils/xindy/modules/rules/Makefile.am +++ b/Build/source/utils/xindy/modules/rules/Makefile.am @@ -19,13 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif - -rulesdir = $(modulesdir)/rules +rulesdir = $(pkgdatadir)/rules RULES = \ isolatin1-exchange.xdy \ diff --git a/Build/source/utils/xindy/modules/styles/Makefile.am b/Build/source/utils/xindy/modules/styles/Makefile.am index 15729535571..0c708504187 100644 --- a/Build/source/utils/xindy/modules/styles/Makefile.am +++ b/Build/source/utils/xindy/modules/styles/Makefile.am @@ -19,13 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -if TETEX_BUILD - modulesdir = $(prefix)/texmf/xindy -else - modulesdir = $(pkgdatadir) -endif - -texdir = $(modulesdir)/styles +texdir = $(pkgdatadir)/styles RULES = basic.xdy makeidx.xdy -- cgit v1.2.3