Replace @...@ with $(...) in these common Makefile.am files.

diff --git a/cat/Makefile.am b/cat/Makefile.am
index 89a33a4..98df337 100644 (file)
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -23,7 +23,7 @@ if HAVE_CAT
 
 man_MANS = virt-cat.1
 
 
 man_MANS = virt-cat.1
 

-noinst_DATA = @top_builddir@/html/virt-cat.1.html
+noinst_DATA = $(top_builddir)/html/virt-cat.1.html

 
 virt-cat.1: virt-cat.pl
        $(POD2MAN) \
 
 virt-cat.1: virt-cat.pl
        $(POD2MAN) \


@@ -32,9 +32,9 @@ virt-cat.1: virt-cat.pl
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 

-@top_builddir@/html/virt-cat.1.html: virt-cat.pl
-       mkdir -p @top_builddir@/html
-       cd @top_builddir@ && pod2html \
+$(top_builddir)/html/virt-cat.1.html: virt-cat.pl
+       mkdir -p $(top_builddir)/html
+       cd $(top_builddir) && pod2html \

          --css 'pod.css' \
          --title 'virt-cat, display a file in a virtual machine' \
          --htmldir html \
          --css 'pod.css' \
          --title 'virt-cat, display a file in a virtual machine' \
          --htmldir html \

diff --git a/df/Makefile.am b/df/Makefile.am
index 4ff2fb1..7234eb7 100644 (file)
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -23,7 +23,7 @@ if HAVE_DF
 
 man_MANS = virt-df.1
 
 
 man_MANS = virt-df.1
 

-noinst_DATA = @top_builddir@/html/virt-df.1.html
+noinst_DATA = $(top_builddir)/html/virt-df.1.html

 
 virt-df.1: virt-df.pl
        $(POD2MAN) \
 
 virt-df.1: virt-df.pl
        $(POD2MAN) \


@@ -32,9 +32,9 @@ virt-df.1: virt-df.pl
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 

-@top_builddir@/html/virt-df.1.html: virt-df.pl
-       mkdir -p @top_builddir@/html
-       cd @top_builddir@ && pod2html \
+$(top_builddir)/html/virt-df.1.html: virt-df.pl
+       mkdir -p $(top_builddir)/html
+       cd $(top_builddir) && pod2html \

          --css 'pod.css' \
          --title 'virt-df, display free space on virtual filesystems' \
          --htmldir html \
          --css 'pod.css' \
          --title 'virt-df, display free space on virtual filesystems' \
          --htmldir html \

diff --git a/edit/Makefile.am b/edit/Makefile.am
index 4fd25f0..4a2a52c 100644 (file)
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -23,7 +23,7 @@ if HAVE_EDIT
 
 man_MANS = virt-edit.1
 
 
 man_MANS = virt-edit.1
 

-noinst_DATA = @top_builddir@/html/virt-edit.1.html
+noinst_DATA = $(top_builddir)/html/virt-edit.1.html

 
 virt-edit.1: virt-edit.pl
        $(POD2MAN) \
 
 virt-edit.1: virt-edit.pl
        $(POD2MAN) \


@@ -32,9 +32,9 @@ virt-edit.1: virt-edit.pl
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 

-@top_builddir@/html/virt-edit.1.html: virt-edit.pl
-       mkdir -p @top_builddir@/html
-       cd @top_builddir@ && pod2html \
+$(top_builddir)/html/virt-edit.1.html: virt-edit.pl
+       mkdir -p $(top_builddir)/html
+       cd $(top_builddir) && pod2html \

          --css 'pod.css' \
          --title 'virt-edit, edit a file in a virtual machine' \
          --htmldir html \
          --css 'pod.css' \
          --title 'virt-edit, edit a file in a virtual machine' \
          --htmldir html \

diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index a1df2ab..a93a1ff 100644 (file)
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -23,7 +23,7 @@ if HAVE_INSPECTOR
 
 man_MANS = virt-inspector.1
 
 
 man_MANS = virt-inspector.1
 

-noinst_DATA = @top_builddir@/html/virt-inspector.1.html
+noinst_DATA = $(top_builddir)/html/virt-inspector.1.html

 
 virt-inspector.1: virt-inspector.pl
        $(POD2MAN) \
 
 virt-inspector.1: virt-inspector.pl
        $(POD2MAN) \


@@ -32,9 +32,9 @@ virt-inspector.1: virt-inspector.pl
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 

-@top_builddir@/html/virt-inspector.1.html: virt-inspector.pl
-       mkdir -p @top_builddir@/html
-       cd @top_builddir@ && pod2html \
+$(top_builddir)/html/virt-inspector.1.html: virt-inspector.pl
+       mkdir -p $(top_builddir)/html
+       cd $(top_builddir) && pod2html \

          --css 'pod.css' \
          --title 'virt-inspector, display OS version, kernel, drivers, mount points, applications, etc. in a virtual machine' \
          --htmldir html \
          --css 'pod.css' \
          --title 'virt-inspector, display OS version, kernel, drivers, mount points, applications, etc. in a virtual machine' \
          --htmldir html \

diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index a9a533c..3d55728 100644 (file)
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -23,7 +23,7 @@ if HAVE_RESCUE
 
 man_MANS = virt-rescue.1
 
 
 man_MANS = virt-rescue.1
 

-noinst_DATA = @top_builddir@/html/virt-rescue.1.html
+noinst_DATA = $(top_builddir)/html/virt-rescue.1.html

 
 virt-rescue.1: virt-rescue.pl
        $(POD2MAN) \
 
 virt-rescue.1: virt-rescue.pl
        $(POD2MAN) \


@@ -32,9 +32,9 @@ virt-rescue.1: virt-rescue.pl
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 
          --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
          $< > $@
 

-@top_builddir@/html/virt-rescue.1.html: virt-rescue.pl
-       mkdir -p @top_builddir@/html
-       cd @top_builddir@ && pod2html \
+$(top_builddir)/html/virt-rescue.1.html: virt-rescue.pl
+       mkdir -p $(top_builddir)/html
+       cd $(top_builddir) && pod2html \

          --css 'pod.css' \
          --title 'virt-rescue, run a rescue shell on a virtual machine' \
          --htmldir html \
          --css 'pod.css' \
          --title 'virt-rescue, run a rescue shell on a virtual machine' \
          --htmldir html \