There were a few "infelicities" that kept the "make distcheck" test from passing. These three patches combine to fix all of them, punting on only one by disabling the install-data-hook rule.>From 7504acedcb71bd80d99abe412e6669b267cade38 Mon Sep 17 00:00:00 2001From: Jim Meyering <meyering at redhat.com> Date: Fri, 21 Aug 2009 13:37:18 +0200 Subject: [PATCH 1/3] build: use newer gettext files * configure.ac: Use gettext 0.15, not 0.14. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 3e057d7..204bfb6 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ test "x$MKISOFS" = "xno" && AC_MSG_ERROR([mkisofs must be installed]) dnl For i18n. AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.14]) +AM_GNU_GETTEXT_VERSION([0.15]) dnl Check for Perl AC_CHECK_PROG([PERL],[perl],[perl],[no]) -- 1.6.4.378.g88f2f>From b077a19ae444aadfe8baf5d29df7125394b1a867 Mon Sep 17 00:00:00 2001From: Jim Meyering <meyering at redhat.com> Date: Fri, 21 Aug 2009 13:32:03 +0200 Subject: [PATCH 2/3] configure.ac: correct typo in package name * configure.ac (PACKAGE_NAME): It's virt-v2v, not virtv2v. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 204bfb6..9acc430 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ m4_define([virtv2v_release], [68]) # extra can be any string m4_define([virtv2v_extra], []) -AC_INIT([virtv2v],virtv2v_major.virtv2v_minor.virtv2v_release[]virtv2v_extra) +AC_INIT([virt-v2v],virtv2v_major.virtv2v_minor.virtv2v_release[]virtv2v_extra) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) -- 1.6.4.378.g88f2f>From 2e33faf68770703d832f693528229dc3676ecace Mon Sep 17 00:00:00 2001From: Jim Meyering <meyering at redhat.com> Date: Fri, 21 Aug 2009 12:45:46 +0200 Subject: [PATCH 3/3] build: arrange for "make distcheck" to pass * perl/Makefile.am (install-data-hook): Remove rule, for now. (clean-local): Use perl's "realclean" target, not "clean". The latter would fail to remove Makefile-pl.old. * Makefile.am (CLEANFILES): Define, to clean up after pod2html. * v2v/Makefile.am (CLEANFILES): Define, so that "make clean" removes generated *.1 files. * v2v/Makefile.am (virt-v2v.1): Don't redirect directly to $@. *** empty log message *** --- Makefile.am | 2 ++ perl/Makefile.am | 7 ++++--- v2v/Makefile.am | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4e75eb0..9e2918b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,3 +18,5 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = perl po v2v + +CLEANFILES = pod2htmd.tmp pod2htmi.tmp html/$(PACKAGE_NAME).1.html diff --git a/perl/Makefile.am b/perl/Makefile.am index f0d73f1..414abdb 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -33,8 +33,9 @@ Makefile-pl: Makefile.PL #CLEANFILES = Makefile-pl clean-local: - -$(MAKE) -f Makefile-pl clean + -$(MAKE) -f Makefile-pl realclean rm -f Makefile-pl -install-data-hook: - $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install +# Don't do this: it causes "make distcheck" to fail. +#install-data-hook: +# $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 49dac50..5030742 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -20,15 +20,17 @@ EXTRA_DIST = \ virt-v2v.pl man_MANS = virt-v2v.1 +CLEANFILES = $(man_MANS) noinst_DATA = @top_builddir@/html/virt-v2v.1.html virt-v2v.1: virt-v2v.pl + rm -f $@-t $@ $(POD2MAN) \ --section 1 \ -c "Virtualization Support" \ --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - $< > $@ + $< > $@-t && mv $@-t $@ @top_builddir@/html/virt-v2v.1.html: virt-v2v.pl mkdir -p @top_builddir@/html -- 1.6.4.378.g88f2f
Richard W.M. Jones
2009-Aug-21 11:58 UTC
[Libguestfs] [virt-v2v] "make distcheck" now passes
On Fri, Aug 21, 2009 at 01:44:50PM +0200, Jim Meyering wrote:> -AM_GNU_GETTEXT_VERSION([0.14]) > +AM_GNU_GETTEXT_VERSION([0.15])Gettext on RHEL 5.4 Beta is version 0.14, so I would be wary about making such a change, since it means you won't be able to compile this on RHEL.> virt-v2v.1: virt-v2v.pl > + rm -f $@-t $@ > $(POD2MAN) \ > --section 1 \ > -c "Virtualization Support" \ > --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ > - $< > $@ > + $< > $@-t && mv $@-t $@Why does this use && rather than just a rule on the following line? Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top
On 21/08/09 12:44, Jim Meyering wrote:> There were a few "infelicities" that kept the "make distcheck" > test from passing. These three patches combine to fix all of them, > punting on only one by disabling the install-data-hook rule. > >> From 7504acedcb71bd80d99abe412e6669b267cade38 Mon Sep 17 00:00:00 2001 > From: Jim Meyering<meyering at redhat.com> > Date: Fri, 21 Aug 2009 13:37:18 +0200 > Subject: [PATCH 1/3] build: use newer gettext files > > * configure.ac: Use gettext 0.15, not 0.14. > --- > configure.ac | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 3e057d7..204bfb6 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -54,7 +54,7 @@ test "x$MKISOFS" = "xno"&& AC_MSG_ERROR([mkisofs must be installed]) > > dnl For i18n. > AM_GNU_GETTEXT([external]) > -AM_GNU_GETTEXT_VERSION([0.14]) > +AM_GNU_GETTEXT_VERSION([0.15]) > > dnl Check for Perl > AC_CHECK_PROG([PERL],[perl],[perl],[no]) > -- > 1.6.4.378.g88f2f >As discussed, NACK to this because gettext 0.15 isn't available in RHEL5. I've added a different change which explicitly removes po/stamp-po from the top level Makefile.am.>> From b077a19ae444aadfe8baf5d29df7125394b1a867 Mon Sep 17 00:00:00 2001 > From: Jim Meyering<meyering at redhat.com> > Date: Fri, 21 Aug 2009 13:32:03 +0200 > Subject: [PATCH 2/3] configure.ac: correct typo in package name > > * configure.ac (PACKAGE_NAME): It's virt-v2v, not virtv2v. > --- > configure.ac | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 204bfb6..9acc430 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -22,7 +22,7 @@ m4_define([virtv2v_release], [68]) > # extra can be any string > m4_define([virtv2v_extra], []) > > -AC_INIT([virtv2v],virtv2v_major.virtv2v_minor.virtv2v_release[]virtv2v_extra) > +AC_INIT([virt-v2v],virtv2v_major.virtv2v_minor.virtv2v_release[]virtv2v_extra) > AC_CONFIG_AUX_DIR([build-aux]) > AM_INIT_AUTOMAKE([foreign]) > > -- > 1.6.4.378.g88f2fACK.>> From 2e33faf68770703d832f693528229dc3676ecace Mon Sep 17 00:00:00 2001 > From: Jim Meyering<meyering at redhat.com> > Date: Fri, 21 Aug 2009 12:45:46 +0200 > Subject: [PATCH 3/3] build: arrange for "make distcheck" to pass > > * perl/Makefile.am (install-data-hook): Remove rule, for now. > (clean-local): Use perl's "realclean" target, not "clean". > The latter would fail to remove Makefile-pl.old. > * Makefile.am (CLEANFILES): Define, to clean up after pod2html. > * v2v/Makefile.am (CLEANFILES): Define, so that "make clean" > removes generated *.1 files. > * v2v/Makefile.am (virt-v2v.1): Don't redirect directly to $@. > > *** empty log message *** > --- > Makefile.am | 2 ++ > perl/Makefile.am | 7 ++++--- > v2v/Makefile.am | 4 +++- > 3 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 4e75eb0..9e2918b 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -18,3 +18,5 @@ > ACLOCAL_AMFLAGS = -I m4 > > SUBDIRS = perl po v2v > + > +CLEANFILES = pod2htmd.tmp pod2htmi.tmp html/$(PACKAGE_NAME).1.html > diff --git a/perl/Makefile.am b/perl/Makefile.am > index f0d73f1..414abdb 100644 > --- a/perl/Makefile.am > +++ b/perl/Makefile.am > @@ -33,8 +33,9 @@ Makefile-pl: Makefile.PL > #CLEANFILES = Makefile-pl > > clean-local: > - -$(MAKE) -f Makefile-pl clean > + -$(MAKE) -f Makefile-pl realclean > rm -f Makefile-pl > > -install-data-hook: > - $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install > +# Don't do this: it causes "make distcheck" to fail. > +#install-data-hook: > +# $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install > diff --git a/v2v/Makefile.am b/v2v/Makefile.am > index 49dac50..5030742 100644 > --- a/v2v/Makefile.am > +++ b/v2v/Makefile.am > @@ -20,15 +20,17 @@ EXTRA_DIST = \ > virt-v2v.pl > > man_MANS = virt-v2v.1 > +CLEANFILES = $(man_MANS) > > noinst_DATA = @top_builddir@/html/virt-v2v.1.html > > virt-v2v.1: virt-v2v.pl > + rm -f $@-t $@ > $(POD2MAN) \ > --section 1 \ > -c "Virtualization Support" \ > --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ > - $< > $@ > + $< > $@-t&& mv $@-t $@ > > @top_builddir@/html/virt-v2v.1.html: virt-v2v.pl > mkdir -p @top_builddir@/html > -- > 1.6.4.378.g88f2fACK. I've applied the 2 changes I ACKd. Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490