diff options
| author | Vladimir Volovich <vvv@vsu.ru> | 2008-03-28 12:58:57 +0000 |
|---|---|---|
| committer | Vladimir Volovich <vvv@vsu.ru> | 2008-03-28 12:58:57 +0000 |
| commit | e54f0b67e0f7bdc7ddfd1dbee4a0155392614f2e (patch) | |
| tree | b020f98f79974de73c7d7af1a66f9f042c860dac /Build/source/utils | |
| parent | 8ccfdb1bc36ca6dc3e3758ff6f79b1ed99b735f2 (diff) | |
rte/Makefile.am: cleanup (and improve behaviour for subsequent builds if building ordrules failed)
git-svn-id: svn://tug.org/texlive/trunk@7199 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
| -rw-r--r-- | Build/source/utils/xindy/rte/Makefile.am | 21 | ||||
| -rw-r--r-- | Build/source/utils/xindy/rte/Makefile.in | 17 |
2 files changed, 15 insertions, 23 deletions
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am index 11768f178b5..f7c67dbb153 100644 --- a/Build/source/utils/xindy/rte/Makefile.am +++ b/Build/source/utils/xindy/rte/Makefile.am @@ -21,26 +21,21 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -export CLISP_LINKKIT = $(CLISP_LIB)/linkkit - -binariesdir = ../binaries - -all-local: xindy-build-dir +SUBDIRS = ordrules +EXTRA_DIST = NEWS README ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh +binariesdir = ../binaries -xindy-build-dir: +all-local: rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done $(MAKE) -C ordrules ordrulei.c - sh $(CLISP_LIB)/clisp-link add-module-set ordrules $(CLISP_LIB)/full $@ - cp $@/lisp.run $(binariesdir)/xindy.run - cp $@/lispinit.mem $(binariesdir)/base.mem + env CLISP_LINKKIT="$(CLISP_LIB)/linkkit" \ + sh "$(CLISP_LIB)/clisp-link" add-module-set ordrules "$(CLISP_LIB)/full" xindy-build-dir + cp xindy-build-dir/lisp.run $(binariesdir)/xindy.run + cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem clean-local: rm -rf xindy-build-dir test "$(builddir)" = "$(srcdir)" || for i in $(ORDRULES_FILES); do rm -f ordrules/$$i; done - -SUBDIRS = ordrules - -EXTRA_DIST = NEWS README diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in index e9c6fd1f6ec..3acf0e948c4 100644 --- a/Build/source/utils/xindy/rte/Makefile.in +++ b/Build/source/utils/xindy/rte/Makefile.in @@ -156,10 +156,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -binariesdir = ../binaries -ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh SUBDIRS = ordrules EXTRA_DIST = NEWS README +ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh +binariesdir = ../binaries all: all-recursive .SUFFIXES: @@ -466,17 +466,14 @@ uninstall-am: tags-recursive uninstall uninstall-am -export CLISP_LINKKIT = $(CLISP_LIB)/linkkit - -all-local: xindy-build-dir - -xindy-build-dir: +all-local: rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done $(MAKE) -C ordrules ordrulei.c - sh $(CLISP_LIB)/clisp-link add-module-set ordrules $(CLISP_LIB)/full $@ - cp $@/lisp.run $(binariesdir)/xindy.run - cp $@/lispinit.mem $(binariesdir)/base.mem + env CLISP_LINKKIT="$(CLISP_LIB)/linkkit" \ + sh "$(CLISP_LIB)/clisp-link" add-module-set ordrules "$(CLISP_LIB)/full" xindy-build-dir + cp xindy-build-dir/lisp.run $(binariesdir)/xindy.run + cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem clean-local: rm -rf xindy-build-dir |