diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 15:23:20 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 19:26:52 +0200 |
commit | 0cca184f65b5397d9e52f32365ab962d5af2f7ea (patch) | |
tree | 4496970adac77c2b11ebb5b7393d6764f38adc55 /lib/am | |
parent | 9c468420a8ff18940ab2e9d47d096788ed5801f0 (diff) | |
parent | 0256f1d66ff28cfcef895eb72b15e40e6de442e0 (diff) | |
download | automake-0cca184f65b5397d9e52f32365ab962d5af2f7ea.tar.gz |
Merge branch 'micro' into maint
* micro:
lisp: fix a failure with Solaris /usr/xpg4/bin/sh
tests: sanitize 'unset' usages
tests: fix some botched/outdated comments
tests: use perl, not find+rm, to remove temporary directories
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/am')
-rw-r--r-- | lib/am/lisp.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/am/lisp.am b/lib/am/lisp.am index de9e5bbc1..bfb023f53 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -31,13 +31,13 @@ endif %?INSTALL% ## input (which would erronously put it in $(srcdir) in VPATH builds), ## so we override that, too. if test "$(EMACS)" != "no"; then \ - am__subdir_includes=''; \ + am__dir=. am__subdir_includes=''; \ case $@ in */*) \ am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \ am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \ esac; \ ## Emacs byte-compilation won't create this automatically, sadly. - test -d $$am__dir || $(MKDIR_P) $$am__dir || exit 1; \ + test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \ $(EMACS) --batch \ $(AM_ELCFLAGS) $(ELCFLAGS) \ $$am__subdir_includes -L $(builddir) -L $(srcdir) \ |