[Automake-NG] [FYI] [ng] header vars: less use of @SUBST@ occurrences

[Stefano Lattarini]

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

Signed-off-by: Stefano Lattarini <address@hidden>
---
 lib/am/header-vars.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index d69ad3a..2221c5b 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
-- 
1.7.12.rc0