[parted-devel] [PATCH 10/10] Tweak distcheck.

[Joel Granados]

On Tue, Jun 09, 2009 at 02:39:36PM +0200, Jim Meyering wrote:
> Joel Granados Moreno wrote:
> > * distcheck.mk (install-transform-check) : The binaries will be located
> >   in /sbin instead of /bin.
> > * distcheck.mk (my-instcheck) : Treat "i" as a variable by prepending two
> >   "$".
> 
> Oops.  Typo in file name.  It's dist-check.mk, not distcheck.mk.
> So the log should be like this:
> 
> -----------
> build: tweak distcheck
> 
> * dist-check.mk (install-transform-check): The binaries will be
> located in /sbin instead of /bin.
> -----------
> 
> > diff --git a/dist-check.mk b/dist-check.mk
> > index 16f3859..e6a95d0 100644
> > --- a/dist-check.mk
> > +++ b/dist-check.mk
> > @@ -46,7 +46,7 @@ define install-transform-check
> >      && rm -rf $(pfx)					\
> >      && $(MAKE) program_transform_name='s/.*/zyx/'	\
> >        prefix=$(pfx) install				\
> > -    && test "$$(echo $(pfx)/bin/*)" = "$(pfx)/bin/zyx"	\
> > +    && test "$$(echo $(pfx)/sbin/*)" = "$(pfx)/sbin/zyx"\
> 
> That part is fine, but please add a space before the trailing backslash.
> 
> >      && test "$$(find $(pfx)/share/man -type f|sed 's,.*/,,;s,\..*,,')" = "zyx"
> >  endef
> >
> > @@ -54,11 +54,11 @@ endef
> >  # Note that neither the binary, ginstall, nor the ].1 man page is installed.
> >  define my-instcheck
> >    $(MAKE) prefix=$(pfx) install				\
> > -    && test ! -f $(pfx)/bin/ginstall			\
> > +    && test ! -f $(pfx)/sbin/ginstall			\
> 
> ginstall isn't installed by this package,
> so that shouldn't matter.
> 
> >      && { fail=0;					\
> >        for i in $(built_programs); do			\
> > -        test "$$i" = ginstall && i=install;		\
> > -        for j in "$(pfx)/bin/$$i"			\
> > +        test "$$i" = ginstall && $$i=install;		\
> > +        for j in "$(pfx)/sbin/$$i"			\
> 
> Same here.  You should be able to remove these two latter hunks.

So we leave them like that? Even though they are not relevant to parted.

> 
> >                   "$(pfx)/share/man/man1/$$i.1"; do	\
> >            case $$j in *'[.1') continue;; esac;		\
> >            test -f "$$j" && :				\

-- 
Joel Andres Granados
Brno, Czech Republic, Red Hat.