12:33 p.m.
---
po-docs/ja/Makefile.am | 6 +++---
po-docs/uk/Makefile.am | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
index da1bcc3..820f91a 100644
--- a/po-docs/ja/Makefile.am
+++ b/po-docs/ja/Makefile.am
@@ -160,8 +160,8 @@ $(podfiles):
# XXX Can automake do this properly?
install-data-hook:
$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man1
- $(INSTALL) -m 0644 *.1 $(DESTDIR)$(mandir)/$(LINGUA)/man1
+ $(INSTALL) -m 0644 $(srcdir)/*.1 $(DESTDIR)$(mandir)/$(LINGUA)/man1
$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man3
- $(INSTALL) -m 0644 *.3 $(DESTDIR)$(mandir)/$(LINGUA)/man3
+ $(INSTALL) -m 0644 $(srcdir)/*.3 $(DESTDIR)$(mandir)/$(LINGUA)/man3
$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man5
- $(INSTALL) -m 0644 *.5 $(DESTDIR)$(mandir)/$(LINGUA)/man5
+ $(INSTALL) -m 0644 $(srcdir)/*.5 $(DESTDIR)$(mandir)/$(LINGUA)/man5
diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
index da1bcc3..820f91a 100644
--- a/po-docs/uk/Makefile.am
+++ b/po-docs/uk/Makefile.am
@@ -160,8 +160,8 @@ $(podfiles):
# XXX Can automake do this properly?
install-data-hook:
$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man1
- $(INSTALL) -m 0644 *.1 $(DESTDIR)$(mandir)/$(LINGUA)/man1
+ $(INSTALL) -m 0644 $(srcdir)/*.1 $(DESTDIR)$(mandir)/$(LINGUA)/man1
$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man3
- $(INSTALL) -m 0644 *.3 $(DESTDIR)$(mandir)/$(LINGUA)/man3
+ $(INSTALL) -m 0644 $(srcdir)/*.3 $(DESTDIR)$(mandir)/$(LINGUA)/man3
$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man5
- $(INSTALL) -m 0644 *.5 $(DESTDIR)$(mandir)/$(LINGUA)/man5
+ $(INSTALL) -m 0644 $(srcdir)/*.5 $(DESTDIR)$(mandir)/$(LINGUA)/man5
--
1.8.5.1
12:33 p.m.
New subject: [PATCH 2/2] Fix virt-builder tests for out-of-tree build
---
builder/test-virt-builder-list.sh | 4 ++--
builder/test-virt-builder.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builder/test-virt-builder-list.sh b/builder/test-virt-builder-list.sh
index 11305a9..ff16abe 100755
--- a/builder/test-virt-builder-list.sh
+++ b/builder/test-virt-builder-list.sh
@@ -21,9 +21,9 @@
export LANG=C
set -e
-abs_srcdir=$(cd $srcdir && pwd)
+abs_builddir=$(pwd)
-export VIRT_BUILDER_SOURCE=file://$abs_srcdir/test-index
+export VIRT_BUILDER_SOURCE=file://$abs_builddir/test-index
short_list=$($VG ./virt-builder --no-check-signature --no-cache --list)
diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
index 6296d16..438f2e9 100755
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
@@ -19,9 +19,9 @@
export LANG=C
set -e
-abs_srcdir=$(cd $srcdir && pwd)
+abs_builddir=$(pwd)
-export VIRT_BUILDER_SOURCE=file://$abs_srcdir/test-index
+export VIRT_BUILDER_SOURCE=file://$abs_builddir/test-index
if [ ! -f fedora.xz ]; then
echo "$0: test skipped because there is no fedora.xz in the build
directory"
--
1.8.5.1
2:35 p.m.
New subject: [PATCH 2/2] Fix virt-builder tests for out-of-tree build
On Sat, Dec 07, 2013 at 07:33:46PM +0100, Hilko Bengen wrote:
---
builder/test-virt-builder-list.sh | 4 ++--
builder/test-virt-builder.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builder/test-virt-builder-list.sh b/builder/test-virt-builder-list.sh
index 11305a9..ff16abe 100755
--- a/builder/test-virt-builder-list.sh
+++ b/builder/test-virt-builder-list.sh
@@ -21,9 +21,9 @@
export LANG=C
set -e
-abs_srcdir=$(cd $srcdir && pwd)
+abs_builddir=$(pwd)
-export VIRT_BUILDER_SOURCE=file://$abs_srcdir/test-index
+export VIRT_BUILDER_SOURCE=file://$abs_builddir/test-index
short_list=$($VG ./virt-builder --no-check-signature --no-cache --list)
diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
index 6296d16..438f2e9 100755
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
@@ -19,9 +19,9 @@
export LANG=C
set -e
-abs_srcdir=$(cd $srcdir && pwd)
+abs_builddir=$(pwd)
-export VIRT_BUILDER_SOURCE=file://$abs_srcdir/test-index
+export VIRT_BUILDER_SOURCE=file://$abs_builddir/test-index
if [ ! -f fedora.xz ]; then
echo "$0: test skipped because there is no fedora.xz in the build
directory"
--
1.8.5.1
Looks good, ACK to both patches.
(You should be able to push these)
Thanks, Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top
4003
days inactive
4003
days old
2 comments
2 participants
participants (2)
-
Hilko Bengen -
Richard W.M. Jones