Kill the last remaining varprefix

- we're just mangling varprefix to localstatedir anyway, might as well
  just avoid that little extra trouble...

diff --git a/Makefile.am b/Makefile.am
index 74f1031..b509b60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,11 +150,8 @@ EXTRA_DIST += rpmrc.in
 
 rpmconfig_DATA += macros
 macros: $(top_srcdir)/macros.in
-       @$(SED) \
-         -e "s,[@]varprefix[@],$(localstatedir),g" \
-         < $(top_srcdir)/macros.in > macros.tmp \
-         && ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.tmp )
-CLEANFILES += macros.tmp macros
+         ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.in )
+CLEANFILES += macros
 EXTRA_DIST += macros.in
 
 noinst_DATA = platform

diff --git a/macros.in b/macros.in
index bb34ca5..377c57d 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -26,7 +26,7 @@
 #
 %_usr                  @prefix@
 %_usrsrc               %{_usr}/src
-%_var                  @varprefix@
+%_var                  @localstatedir@
 
 #==============================================================================
 # ---- Generally useful path macros.