From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 27 Jul 2012 08:24:28 +0000 (+0200)
Subject: [ng] header vars: less use of @SUBST@ occurrences
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=783c0e6879e3c575fc88532c636703b03f9c64d9;p=thirdparty%2Fautomake.git

[ng] header vars: less use of @SUBST@ occurrences

* lib/am/header-vars.am: Use $(PACKAGE) and $(srcdir) throughout
rather than @PACKAGE@ and @srcdir@.

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

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index d69ad3a04..2221c5bda 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -22,7 +22,7 @@ ifndef .FEATURES
   $(error Automake-NG based builds require GNU make 3.81 or later)
 endif
 
-VPATH = @srcdir@
+VPATH = $(srcdir)
 
 ## Enhance performance by removing GNU make builtin rules that would be
 ## rather irrelevant (e.g., rules to automatically check out files from
@@ -302,10 +302,10 @@ am.clean-cmd.f = $(call am.xargs-map,am.rm-f,$1)
 am.clean-cmd.d = $(call am.xargs-map,am.rm-rf,$1)
 
 ## Some derived variables that have been found to be useful.
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgdatadir = $(datadir)/$(PACKAGE)
+pkgincludedir = $(includedir)/$(PACKAGE)
+pkglibdir = $(libdir)/$(PACKAGE)
+pkglibexecdir = $(libexecdir)/$(PACKAGE)
 
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c