-
-
Notifications
You must be signed in to change notification settings - Fork 412
docs/Makefile.am: fixed make dist, fix custom man sections #2842
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
`make dist` was failing to build all man pages. Changed how the *-prepped file dependencies are handled to fix. Custom man sections were being implemented in configure, but automake runs before they are chosen, so the Makefile.in were missing the install logic. Changed to use _DATA targets with directories that can be chosen at configure time Also added index.txt to DIST target to fix distcheck Fixed substitution bug in external_apis/Makefile.am Signed-off-by: Scott Shambarger <devel@shambarger.net>
|
❌ Build nut 2.8.2.2817-master failed (commit d9c4063805 by @sshambar) |
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
Great catch, reasonable analysis and fix - thanks! How did you stumble on this? On many systems, I did have concerns about better checks of the archive validity, posted at #2829... I suppose your PR brings the solution a step closer :) |
|
✅ Build nut 2.8.2.2818-master completed (commit 8ce102b6c2 by @jimklimov) |
I was trying to fix the Fedora RPM to build HEAD, and Of course, then trying to build the RPM failed to install the man pages (because the install-man: rule was empty), and figured how the man custom-section change caused the automake issues... testing my fix exposed the missing index.txt dist file... I found a couple other issues updating the RPM, but I figured fixing the build was best done first :) |
|
I think the changes about Your new ruleset seems factually wrong in any case (maybe that is what upsets the build): The Also, calling autotools make is more complicated than that (see other cases with AM_MAKEFLAGS, Currently it seems to end up with no Also, the Was this bit critical for your fixes? I'll try to put back the previous code for these, to see if it helps. |
…pstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
The problem I hit with .prep-src-docs as it was used is that it "satisfied" it's first target (nut.conf.5 in my case), as nut.conf.5 didn't have any explicit recipes... the correct solution would be to have the Reverted... nut.conf.5 will still fail on I guess .NOTINTERMEDIATE probably is a GNU thing, would .PRECIOUS be portable? |
|
Actually nut.conf.{5,html} seems to have been a tip of the iceberg, just first in list. A
Aren't you supposed to re- There's also a number of files generated by |
…ents to help recipe tracing [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…client.la compilation [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…etworkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
Seems the main trick in this regard was about |
… on top of file [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…OL_MANS definitions [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ist-X (where X in [MAN_MANS, HTML_MANS, SRC_ALL_PAGES]) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… (sources - always) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…k ALL those we know about (for dist) vs. those we want in this build configuration [networkupstools#2842, networkupstools#2829] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…_VERSION substitutable from templates [networkupstools#722] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…!WITH_MANS !SKIP_MANS, only warn about it [networkupstools#2842] We may have the pages from tarball, or actually know about the tools needed to build them. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…stools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
❌ Build nut 2.8.2.2821-master failed (commit 5ff494b65a by @jimklimov) |
… on systems without asciidoc (use distcheck-light-DIST_ALL_PAGES to fake pre-built man pages) [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Fix generation of index.html which on published nut-website was > Last updated 2023-09-14 14:43:49 UTC -- Network UPS Tools 2.8.0.1 Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…tworkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…re [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…k-fake-man" [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…NUT_REPORT_FEATURE is about the caller request (may be auto, etc.) [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… SUBDIRS of main Makefile; avoid two definitions of "all" goal there [networkupstools#2842, networkupstools#2825] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…NUT_REPORT_FEATURE is about the ability (aligned with caller request) [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ls#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…_SKIPBUILD_LIST [networkupstools#2843] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…med test results [networkupstools#2843] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…TCHECK_FLAGS (if any) [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ipes that tolerate placeholders for pre-built man pages [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ipes that tolerate placeholders for pre-built man pages [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…UNABLE_MANS [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…OC_INSTALL_DISTED_MANS [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…or distcheck-ci sub-builds) [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…BLE_MANS [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…NOWN_UNABLE_MANS [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…NOWN_UNABLE_MANS [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ents for particular document types [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…differentiate from DIST_ALL_HTML_PAGES [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…t-man:DIST_ALL_MAN_PAGES goals [networkupstools#2842] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…orkupstools#2825] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…` released with NUT v2.8.3 Fallout of networkupstools#2842, used wrong variable name for checking the requested list of doc types Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Fix fallout from PR #2842 : do fail `configure` when requested doc types can not be built
make distwas failing to build all man pages. Changed how the *-prepped file dependencies are handled to fix.Custom man sections were being implemented in configure, but automake runs before they are chosen, so the Makefile.in were missing the install logic. Changed to use _DATA targets with directories that can be chosen at configure time
Also added index.txt to DIST target to fix distcheck
Fixed substitution bug in external_apis/Makefile.am