[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 f1b319be14f7ce8765b030a8b26d450028fa0d9c..759e76990d31aa652762f114227c8d0d9b4bd35c 100644 (file)
--- 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 b4b850e2410e3fdd4e5fabc43d3ea4f0c8ed4d2e..5ed0149a7a17be3d0386c5a52456bb81fd547495 100644 (file)
--- 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.