| Message ID | 20200717150526.124733-1-matthias.andree@gmx.de |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [Openvpn-devel,1/2] Automake options: add subdir-objects, and clean up | expand |
On 17/07/2020 17:05, Matthias Andree wrote: > Signed-off-by: Matthias Andree <matthias.andree@gmx.de> > --- > doc/Makefile.am | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/doc/Makefile.am b/doc/Makefile.am > index add92198..80cb2cb8 100644 > --- a/doc/Makefile.am > +++ b/doc/Makefile.am > @@ -59,8 +59,9 @@ else > endif > > if HAVE_PYDOCUTILS > -dist_noinst_DATA += openvpn.8 > -dist_html_DATA = openvpn.8.html > +nodist_noinst_DATA = openvpn.8 > +nodist_html_DATA = openvpn.8.html > +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) > > # Failsafe - do not delete these files unless we can recreate them > CLEANFILES = \ Thanks! This fixes the 'make distdir', which should also fix the 'make check' issues Gert found [1]. Acked-By: David Sommerseth <davids@openvpn.net> [1] Message-Id: 20200717131607.GS1431@greenie.muc.de <https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20436.html>
On 17/07/2020 17:36, David Sommerseth wrote: > On 17/07/2020 17:05, Matthias Andree wrote: >> Signed-off-by: Matthias Andree <matthias.andree@gmx.de> >> --- >> doc/Makefile.am | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/doc/Makefile.am b/doc/Makefile.am >> index add92198..80cb2cb8 100644 >> --- a/doc/Makefile.am >> +++ b/doc/Makefile.am >> @@ -59,8 +59,9 @@ else >> endif >> >> if HAVE_PYDOCUTILS >> -dist_noinst_DATA += openvpn.8 >> -dist_html_DATA = openvpn.8.html >> +nodist_noinst_DATA = openvpn.8 >> +nodist_html_DATA = openvpn.8.html >> +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) >> >> # Failsafe - do not delete these files unless we can recreate them >> CLEANFILES = \ > > > Thanks! This fixes the 'make distdir', which should also fix the 'make check' > issues Gert found [1]. > > Acked-By: David Sommerseth <davids@openvpn.net> > > > [1] Message-Id: 20200717131607.GS1431@greenie.muc.de > > <https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20436.html> So I'm just retracting the Acked-By ... as this isn't needed. We were just confused by some failing tests on one of the buildslaves and realised to late it failed with 'make dist' - not 'make check'. And then this change makes things worse by not distributing generated man/html files if py-docutils is not present. All the 'make dist*' targets _should_ fail if py-docutils is not present and the doc/openvpn.8 and doc/openvpn.8.html files are missing. Running 'make check' should not fail in any if these cases.
Am 17.07.20 um 17:05 schrieb Matthias Andree: > Signed-off-by: Matthias Andree <matthias.andree@gmx.de> > --- > doc/Makefile.am | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/doc/Makefile.am b/doc/Makefile.am > index add92198..80cb2cb8 100644 > --- a/doc/Makefile.am > +++ b/doc/Makefile.am > @@ -59,8 +59,9 @@ else > endif > > if HAVE_PYDOCUTILS > -dist_noinst_DATA += openvpn.8 > -dist_html_DATA = openvpn.8.html > +nodist_noinst_DATA = openvpn.8 > +nodist_html_DATA = openvpn.8.html > +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) NAK - reject - superseded by newer patch.
diff --git a/doc/Makefile.am b/doc/Makefile.am index add92198..80cb2cb8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -59,8 +59,9 @@ else endif if HAVE_PYDOCUTILS -dist_noinst_DATA += openvpn.8 -dist_html_DATA = openvpn.8.html +nodist_noinst_DATA = openvpn.8 +nodist_html_DATA = openvpn.8.html +EXTRA_DIST = openvpn.8 $(nodist_html_DATA) # Failsafe - do not delete these files unless we can recreate them CLEANFILES = \
Signed-off-by: Matthias Andree <matthias.andree@gmx.de> --- doc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.25.4