From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 7 Aug 2012 16:51:31 +0000 (+0200)
Subject: [ng] cleanup: remove few VPATH rewrite workarounds
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc607514748d8892dab26158b6d9693079d3a20;p=thirdparty%2Fautomake.git

[ng] cleanup: remove few VPATH rewrite workarounds

They are not needed by GNU make, which performs no implicit VPATH
rewrites in its recipes.

* lib/am/lisp.am (install-%DIR%LISP): No need to "correct" possible
VPATH rewrites: GNU makes doesn't do them.  Accordingly, ...
* lib/am/inst-vars.am (am__vpath_adj_setup, am__vpath_adj): ... these
two  variables are no more needed: remove them.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index f1b319be1..759e76990 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -16,14 +16,6 @@
 
 if %?FIRST%
 
-## These variables help stripping any $(VPATH) that some
-## Make implementations prepend before VPATH-found files.
-## The issue is discussed at length in distdir.am.
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
 ## Strip all directories.
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 ## Number of files to install concurrently.
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index b4b850e24..5ed0149a7 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -63,7 +63,6 @@ install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
 	@$(NORMAL_INSTALL)
 ## Do not install anything if EMACS was not found.
 	@if test "$(EMACS)" != no && test -n "$(%NDIR%dir)"; then \
-?!BASE?	  $(am__vpath_adj_setup) \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	  list='$(%DIR%_LISP)'; \
@@ -75,7 +74,7 @@ install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
 ## A lisp file can be in the source directory or the build directory.
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ?BASE?	    $(am__strip_dir) \
-?!BASE?	    $(am__vpath_adj) \
+?!BASE?	    f=$$p; \
 	    echo " $(%DIR%LISP_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	    $(%DIR%LISP_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f" || exit $$?; \
 ## Only install .elc file if it exists.