diff options
author | Vladimir Volovich <vvv@vsu.ru> | 2008-03-23 19:22:24 +0000 |
---|---|---|
committer | Vladimir Volovich <vvv@vsu.ru> | 2008-03-23 19:22:24 +0000 |
commit | 905752d1cb8bf610e1197db3a44f05f82c3f4c09 (patch) | |
tree | 707183090659720bd12a717a50cd6a64f39960b1 | |
parent | 5dfd5af605b9ce96df7d176b6d27b73ed0db86d9 (diff) |
configure.ac: more portable code
rte/Makefile.am: small cleanup (get rid of RM_R variable, use rm -rf)
git-svn-id: svn://tug.org/texlive/trunk@7098 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/utils/xindy/configure | 2 | ||||
-rw-r--r-- | Build/source/utils/xindy/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/utils/xindy/rte/Makefile.am | 10 | ||||
-rw-r--r-- | Build/source/utils/xindy/rte/Makefile.in | 9 |
4 files changed, 10 insertions, 13 deletions
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 4c91b4153c3..2a50374275d 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -4951,7 +4951,7 @@ echo "$as_me: error: clisp binary is not executable: $CLISP" >&2;} { (exit 1); exit 1; }; } { echo "$as_me:$LINENO: checking for clisp library directory" >&5 echo $ECHO_N "checking for clisp library directory... $ECHO_C" >&6; } - CLISP_LIB=$($CLISP -q -norc -x '(progn (princ *lib-directory*) (values))') + CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))'` { echo "$as_me:$LINENO: result: $CLISP_LIB" >&5 echo "${ECHO_T}$CLISP_LIB" >&6; } test -f "$CLISP_LIB/clisp-link" || { { echo "$as_me:$LINENO: error: expected file is not found: $CLISP_LIB/clisp-link" >&5 diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index 37f26509351..b3cd57d8f3b 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -107,7 +107,7 @@ fi if test -n "$CLISP"; then test -x "$CLISP" || AC_MSG_ERROR([clisp binary is not executable: $CLISP]) AC_MSG_CHECKING([for clisp library directory]) - CLISP_LIB=$($CLISP -q -norc -x '(progn (princ *lib-directory*) (values))') + CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))'` AC_MSG_RESULT([$CLISP_LIB]) test -f "$CLISP_LIB/clisp-link" || AC_MSG_ERROR([expected file is not found: $CLISP_LIB/clisp-link]) test -d "$CLISP_LIB/full" || AC_MSG_ERROR([expected directory is not found: $CLISP_LIB/full]) diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am index a3a1e78e265..98e32dbc474 100644 --- a/Build/source/utils/xindy/rte/Makefile.am +++ b/Build/source/utils/xindy/rte/Makefile.am @@ -54,8 +54,6 @@ clisp_modules := --with-dynamic-ffi --ignore-absence-of-libsigsegv all: xindy-build-dir -RM_R = rm -rf - if !EXT_CLISP $(clisp_builddir): $(clisp_src) cd $(clisp_src) && ./configure $(clisp_builddir) $(clisp_modules) @@ -75,15 +73,15 @@ endif ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh xindy-build-dir: $(CLISP_PREREQ) - $(RM_R) xindy-build-dir - $(MAKE) -C ordrules ordrulei.c + rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/; done + $(MAKE) -C ordrules ordrulei.c sh $(clisp_link) add-module-set ordrules $(fulldir) $@ cp $@/lisp.run $(binariesdir)/xindy.run cp $@/lispinit.mem $(binariesdir)/base.mem clean-local: - $(RM_R) xindy-build-dir + rm -rf xindy-build-dir $(MAKE) -C ordrules clean if !EXT_CLISP if [ -e $(clisp_builddir) ]; then $(MAKE) -C $(clisp_builddir) clean; fi @@ -93,7 +91,7 @@ endif distclean-local: clean $(MAKE) -C ordrules distclean if !EXT_CLISP - $(RM_R) $(clisp_builddir) + rm -rf $(clisp_builddir) endif # dist rules for clisp are handled via 'darcs dist', so here we include diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in index 41ffa026894..514beacf86e 100644 --- a/Build/source/utils/xindy/rte/Makefile.in +++ b/Build/source/utils/xindy/rte/Makefile.in @@ -159,7 +159,6 @@ binariesdir = ../binaries #clisp_modules=--with-export-syscalls --with-dynamic-ffi --ignore-absence-of-libsigsegv clisp_modules := --with-dynamic-ffi --ignore-absence-of-libsigsegv -RM_R = rm -rf ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh # dist rules for clisp are handled via 'darcs dist', so here we include @@ -328,22 +327,22 @@ all: xindy-build-dir @EXT_CLISP_FALSE@ $(MAKE) -C $(clisp_builddir) check || $(MAKE) -C $(clisp_builddir) check xindy-build-dir: $(CLISP_PREREQ) - $(RM_R) xindy-build-dir - $(MAKE) -C ordrules ordrulei.c + rm -rf xindy-build-dir test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/; done + $(MAKE) -C ordrules ordrulei.c sh $(clisp_link) add-module-set ordrules $(fulldir) $@ cp $@/lisp.run $(binariesdir)/xindy.run cp $@/lispinit.mem $(binariesdir)/base.mem clean-local: - $(RM_R) xindy-build-dir + rm -rf xindy-build-dir $(MAKE) -C ordrules clean @EXT_CLISP_FALSE@ if [ -e $(clisp_builddir) ]; then $(MAKE) -C $(clisp_builddir) clean; fi # remove some extra files to match pristine clisp source distclean-local: clean $(MAKE) -C ordrules distclean -@EXT_CLISP_FALSE@ $(RM_R) $(clisp_builddir) +@EXT_CLISP_FALSE@ rm -rf $(clisp_builddir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |