Skip to content

Commit d9c4063

Browse files
sshambarsshambar
authored
Merge 03a3fd0 into ed967d6 
2 parents ed967d6 + 03a3fd0 commit d9c4063

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

‎docs/man/Makefile.am‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ MAN_CONF_PAGES = \
6161
upssched.conf.$(MAN_SECTION_CFG)
6262
endif WITH_MANS
6363

64-
man@MAN_SECTION_CFG_BASE@_MANS = $(MAN_CONF_PAGES)
64+
mancfgdir = $(mandir)/man$(MAN_SECTION_CFG_BASE)
65+
mancfg_DATA = $(MAN_CONF_PAGES)
6566

6667
HTML_CONF_MANS = \
6768
nut.conf.html \
@@ -134,7 +135,8 @@ else !WITH_NUT_MONITOR
134135
SRC_ALL_PAGES += NUT-Monitor.txt
135136
endif !WITH_NUT_MONITOR
136137

137-
man@MAN_SECTION_CMD_SYS_BASE@_MANS = $(MAN_CLIENT_PAGES)
138+
mansysdir = $(mandir)/man$(MAN_SECTION_CMD_SYS_BASE)
139+
mansys_DATA = $(MAN_CLIENT_PAGES)
138140

139141
HTML_CLIENT_MANS = \
140142
nutupsdrv.html \
@@ -176,7 +178,7 @@ if WITH_MANS
176178
MAN_TOOL_PAGES = nut-scanner.$(MAN_SECTION_CMD_SYS) nut-recorder.$(MAN_SECTION_CMD_SYS) nutconf.$(MAN_SECTION_CMD_SYS)
177179
endif WITH_MANS
178180

179-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_TOOL_PAGES)
181+
mansys_DATA += $(MAN_TOOL_PAGES)
180182

181183
HTML_TOOL_MANS = nut-scanner.html nut-recorder.html nutconf.html
182184

@@ -202,8 +204,8 @@ MAN@MAN_SECTION_CMD_SYS_BASE@_CGI_PAGES = \
202204
endif WITH_MANS
203205

204206
if WITH_CGI
205-
man@MAN_SECTION_CFG_BASE@_MANS += $(MAN@MAN_SECTION_CFG_BASE@_CGI_PAGES)
206-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN@MAN_SECTION_CMD_SYS_BASE@_CGI_PAGES)
207+
mancfg_DATA += $(MAN@MAN_SECTION_CFG_BASE@_CGI_PAGES)
208+
mansys_DATA += $(MAN@MAN_SECTION_CMD_SYS_BASE@_CGI_PAGES)
207209
endif WITH_CGI
208210

209211
HTML_CGI_MANS = \
@@ -424,11 +426,13 @@ MAN@MAN_SECTION_CMD_SYS_BASE@_DEV_PAGES = \
424426
endif WITH_MANS
425427

426428
if WITH_DEV
427-
man@MAN_SECTION_API_BASE@_MANS = $(MAN@MAN_SECTION_API_BASE@_DEV_PAGES)
428-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN@MAN_SECTION_CMD_SYS_BASE@_DEV_PAGES)
429+
manapidir = $(mandir)/man$(MAN_SECTION_API_BASE)
430+
manapi_DATA = $(MAN@MAN_SECTION_API_BASE@_DEV_PAGES)
431+
mansys_DATA += $(MAN@MAN_SECTION_CMD_SYS_BASE@_DEV_PAGES)
429432

430433
if !WITH_PKG_CONFIG
431-
man@MAN_SECTION_CMD_USR_BASE@_MANS = $(MAN@MAN_SECTION_CMD_USR_BASE@_DEV_PAGES)
434+
manusrdir = $(mandir)/man$(MAN_SECTION_CMD_USR_BASE)
435+
manusr_DATA = $(MAN@MAN_SECTION_CMD_USR_BASE@_DEV_PAGES)
432436
endif !WITH_PKG_CONFIG
433437

434438
endif WITH_DEV
@@ -526,7 +530,7 @@ nutscan_add_commented_option_to_device.html: nutscan_add_option_to_device.html
526530
# If (--with-drivers=...) then we only build specific documents, however
527531
# still do track (and EXTRA_DIST, and spellcheck) all available sources.
528532
if SOME_DRIVERS
529-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(DRIVER_MAN_LIST)
533+
mansys_DATA += $(DRIVER_MAN_LIST)
530534
endif
531535

532536
# (--with-serial)
@@ -643,7 +647,7 @@ endif WITH_MANS
643647

644648

645649
if WITH_SERIAL
646-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_SERIAL_PAGES)
650+
mansys_DATA += $(MAN_SERIAL_PAGES)
647651
endif WITH_SERIAL
648652

649653
HTML_SERIAL_MANS = \
@@ -709,7 +713,7 @@ MAN_SNMP_PAGES = snmp-ups.$(MAN_SECTION_CMD_SYS)
709713
endif WITH_MANS
710714

711715
if WITH_SNMP
712-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_SNMP_PAGES)
716+
mansys_DATA += $(MAN_SNMP_PAGES)
713717
endif WITH_SNMP
714718

715719
HTML_SNMP_MANS = snmp-ups.html
@@ -741,7 +745,7 @@ MAN_USB_LIBUSB_PAGES = \
741745
endif WITH_MANS
742746

743747
if WITH_USB
744-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_USB_LIBUSB_PAGES)
748+
mansys_DATA += $(MAN_USB_LIBUSB_PAGES)
745749
endif WITH_USB
746750

747751
HTML_USB_LIBUSB_MANS = \
@@ -765,10 +769,10 @@ MAN_SERIAL_USB_PAGES = \
765769
endif WITH_MANS
766770

767771
if WITH_SERIAL
768-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_SERIAL_USB_PAGES)
772+
mansys_DATA += $(MAN_SERIAL_USB_PAGES)
769773
else !WITH_SERIAL
770774
if WITH_USB
771-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_SERIAL_USB_PAGES)
775+
mansys_DATA += $(MAN_SERIAL_USB_PAGES)
772776
endif WITH_USB
773777
endif !WITH_SERIAL
774778

@@ -784,7 +788,7 @@ MAN_NETXML_PAGES = netxml-ups.$(MAN_SECTION_CMD_SYS)
784788
endif WITH_MANS
785789

786790
if WITH_NEON
787-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_NETXML_PAGES)
791+
mansys_DATA += $(MAN_NETXML_PAGES)
788792
endif WITH_NEON
789793

790794
HTML_NETXML_MANS = netxml-ups.html
@@ -798,7 +802,7 @@ MAN_POWERMAN_PAGES = powerman-pdu.$(MAN_SECTION_CMD_SYS)
798802
endif WITH_MANS
799803

800804
if WITH_LIBPOWERMAN
801-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_POWERMAN_PAGES)
805+
mansys_DATA += $(MAN_POWERMAN_PAGES)
802806
endif WITH_LIBPOWERMAN
803807

804808
HTML_POWERMAN_MANS = powerman-pdu.html
@@ -812,7 +816,7 @@ MAN_IPMIPSU_PAGES = nut-ipmipsu.$(MAN_SECTION_CMD_SYS)
812816
endif WITH_MANS
813817

814818
if WITH_IPMI
815-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_IPMIPSU_PAGES)
819+
mansys_DATA += $(MAN_IPMIPSU_PAGES)
816820
endif WITH_IPMI
817821

818822
HTML_IPMIPSU_MANS = nut-ipmipsu.html
@@ -826,7 +830,7 @@ MAN_MACOSX_PAGES = macosx-ups.$(MAN_SECTION_CMD_SYS)
826830
endif WITH_MANS
827831

828832
if WITH_MACOSX
829-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_MACOSX_PAGES)
833+
mansys_DATA += $(MAN_MACOSX_PAGES)
830834
endif WITH_MACOSX
831835

832836
HTML_MACOSX_MANS = macosx-ups.html
@@ -851,7 +855,7 @@ MAN_MODBUS_PAGES = phoenixcontact_modbus.$(MAN_SECTION_CMD_SYS) \
851855
endif WITH_MANS
852856

853857
if WITH_MODBUS
854-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_MODBUS_PAGES)
858+
mansys_DATA += $(MAN_MODBUS_PAGES)
855859
endif WITH_MODBUS
856860

857861
HTML_MODBUS_MANS = phoenixcontact_modbus.html \
@@ -870,7 +874,7 @@ MAN_LINUX_I2C_PAGES = asem.$(MAN_SECTION_CMD_SYS) pijuice.$(MAN_SECTION_CMD_SYS)
870874
endif WITH_MANS
871875

872876
if WITH_LINUX_I2C
873-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_LINUX_I2C_PAGES)
877+
mansys_DATA += $(MAN_LINUX_I2C_PAGES)
874878
endif WITH_LINUX_I2C
875879

876880
HTML_LINUX_I2C_MANS = asem.html pijuice.html hwmon_ina219.html
@@ -884,7 +888,7 @@ MAN_GPIO_PAGES = generic_gpio.$(MAN_SECTION_CMD_SYS)
884888
endif WITH_MANS
885889

886890
if WITH_GPIO
887-
man@MAN_SECTION_CMD_SYS_BASE@_MANS += $(MAN_GPIO_PAGES)
891+
mansys_DATA += $(MAN_GPIO_PAGES)
888892
endif WITH_GPIO
889893

890894
HTML_GPIO_MANS = generic_gpio.html
@@ -943,7 +947,8 @@ SRC_ALL_PAGES += \
943947
$(SRC_TOOL_PAGES) \
944948
$(SRC_CGI_PAGES) \
945949
$(SRC_DEV_PAGES) \
946-
$(SRC_DRIVERS_PAGES)
950+
$(SRC_DRIVERS_PAGES) \
951+
index.txt
947952

948953
EXTRA_DIST = \
949954
$(SRC_ALL_PAGES) \
@@ -1039,9 +1044,6 @@ $(LINKMAN_INCLUDE_CONSUMERS): linkman-driver-names.txt linkman-drivertool-names.
10391044
# git, and not part of tarball (to be in builddir) - so not in EXTRA_DIST.
10401045
DISTCLEANFILES = $(LINKMAN_INCLUDE_GENERATED)
10411046

1042-
# Make sure sources are there for out-of-tree builds:
1043-
$(HTML_MANS) $(MAN_MANS) index.html: $(abs_top_builddir)/docs/man/.prep-src-docs
1044-
10451047
all-html html-man: $(HTML_MANS) index.html
10461048

10471049
# Have a way to build all man pages, not just those that fit currently
@@ -1177,9 +1179,12 @@ DOCBUILD_END = { \
11771179
### or just touch-files for peace of mind (in-tree builds). Then we
11781180
### use these path names (truncated "-prepped") now surely located
11791181
### in the builddir as the sources for rendered docs.
1180-
*.txt-prepped: $(abs_top_builddir)/docs/man/.prep-src-docs
11811182

1182-
#.txt.txt-prepped: $(abs_top_builddir)/docs/man/.prep-src-docs
1183+
.NOTINTERMEDIATE: %.txt-prepped
1184+
1185+
.txt.txt-prepped:
1186+
rm -f "$(abs_top_builddir)/docs/man/.prep-src-docs"*
1187+
$(MAKE) prep-src-docs
11831188

11841189
### Regarding absolute paths in attributes below: by default asciidoc
11851190
### resolves include paths relative to the main document, so while we

‎scripts/external_apis/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if ENABLE_EXTAPI_ENPHASE
1414
extapi_enphase_datadir = @datadir@/external_apis/enphase
1515
extapi_enphase_data_DATA = enphase/README.adoc
1616

17-
extapi_enphase_execdir = @libexec@
17+
extapi_enphase_execdir = @libexecdir@
1818
extapi_enphase_exec_SCRIPTS = enphase/enphase-monitor
1919

2020
if HAVE_SYSTEMD

0 commit comments

Comments
 (0)