On 08/09/2013 10:09 AM, Daniel P. Berrange wrote: > From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> > > The aclperms.htmlinc file must be generated in $(srcdir) to > let includes work when doing a VPATH build > > Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> > --- > docs/Makefile.am | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/docs/Makefile.am b/docs/Makefile.am > index 9057432..0b0d2d4 100644 > --- a/docs/Makefile.am > +++ b/docs/Makefile.am > @@ -141,13 +141,13 @@ EXTRA_DIST= \ > > BUILT_SOURCES += aclperms.htmlinc > > -CLEANFILES = aclperms.htmlinc > +CLEANFILES = $(srcdir)/aclperms.htmlinc Hmm - this says that in order to build from a tarball, a user must have the tools to generate the htmlinc file (in this case perl). But I guess we already require the user to have perl installed for other things. > > -acl.html:: aclperms.htmlinc > +acl.html:: $(srcdir)/aclperms.htmlinc > > -aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ > - genaclperms.pl Makefile.am > - $(PERL) genaclperms.pl $< > $@ > +$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ > + $(srcdir)/genaclperms.pl Makefile.am The $(srcdir)/ on genaclperms.pl should not be necessary in this line (that is, make should be able to find it via VPATH rules), but it doesn't hurt given that... > + $(PERL) $(srcdir)/genaclperms.pl $< > $@ ...it IS necessary on this line (perl doesn't know what VPATH make is using). ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list