On 2021-08-22, at 13:33:02 +1000, Duncan Roe wrote: > On Sat, Aug 21, 2021 at 10:55:28AM +0100, Jeremy Sowden wrote: > > On 2021-08-21, at 15:38:03 +1000, Duncan Roe wrote: > > > Add a post_process() function to the big shell script inside > > > doxygen/Makefile.am > [...] > > > > Would it not make life easier to move all this shell-script into a > > build_man.sh and just call that from the make-file? Patch attached. > > Of course it would, and that's how it was at library release 1.0.5, > but `make distcheck` would not pass, as it doesn't pass with your > patch as supplied. Ah, yes, sorry, I did see you mention `make distcheck`, but it slipped my mind. > Your patch inspired me to try one last time and, thanks to hours of > grovelling through `info autoconf`, `make distcheck` passes with the > 1-line patch below. > > Remarkably, the resulting tarball includes doxygen/build_man.sh even > though there is no EXTRA_DIST entry for it in Makefile.am. > > VPATH builds still work (e.g. mkdir build; cd build; ../configure; > make) and `make distcleancheck` still passes afterward. > > So, I'll push out another patch rev shortly. Thanks! > > From a1795e7f1baff2d477d0a0a7e3058343baf3d85e Mon Sep 17 00:00:00 2001 > From: Duncan Roe <duncan_roe@xxxxxxxxxxxxxxx> > Date: Sun, 22 Aug 2021 11:19:22 +1000 > Subject: [PATCH libnetfilter_queue] Replace ./build_man.sh with > $(abs_top_srcdir)/doxygen/build_man.sh > > Signed-off-by: Duncan Roe <duncan_roe@xxxxxxxxxxxxxxx> > --- > doxygen/Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am > index 52dca07..aa19c5a 100644 > --- a/doxygen/Makefile.am > +++ b/doxygen/Makefile.am > @@ -25,7 +25,7 @@ doxyfile.stamp: $(doc_srcs) Makefile.am > # but not blank lines > > if BUILD_MAN > - ./build_man.sh > + $(abs_top_srcdir)/doxygen/build_man.sh > endif Funnily enough, I fixed a number of bugs like this earlier in the year in another context. One might have hoped to have remembered. Oh well. J.
Attachment:
signature.asc
Description: PGP signature
