Hi,
On Mon, 2015-10-26 at 16:40 +0200, Jaakko Hannikainen wrote:
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -248,8 +248,6 @@ include Makefile.plugins
> if CLIENT
> bin_PROGRAMS += client/connmanctl
>
> -MANUAL_PAGES += doc/connmanctl.1
> -
> client_connmanctl_SOURCES = client/dbus_helpers.h client/dbus_helpers.c \
> client/services.h client/services.c \
> client/commands.h client/commands.c \
> @@ -385,7 +383,10 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
> EXTRA_DIST += src/main.conf \
> src/eduroam.config
>
> -MANUAL_PAGES += doc/connman.8 doc/connman.conf.5
> +MANUAL_PAGES += doc/connmanctl.1 doc/connman.conf.5 \
> + doc/connman-service.config.5 doc/connman-vpn.conf.5 \
> + doc/connman-vpn-provider.config.5 \
> + doc/connman.8 doc/connman-vpn.8
>
> dist_man_MANS = $(MANUAL_PAGES)
Here we need to allow the user to set a different prefix
with ./configure. This causes the following changes to this patch:
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,7 +378,12 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
doc/vpn-config-format.txt \
doc/vpn-connection-api.txt \
doc/vpn-manager-api.txt doc/vpn-overview.txt \
- doc/session-policy-format.txt
+ doc/session-policy-format.txt \
+ doc/connmanctl.1.in doc/connman.conf.5.in \
+ doc/connman-service.config.5.in \
+ doc/connman-vpn.conf.5.in \
+ doc/connman-vpn-provider.config.5.in \
+ doc/connman.8.in doc/connman-vpn.8.in
EXTRA_DIST += src/main.conf \
src/eduroam.config
@@ -388,7 +393,7 @@ MANUAL_PAGES += doc/connmanctl.1 doc/connman.conf.5 \
doc/connman-vpn-provider.config.5 \
doc/connman.8 doc/connman-vpn.8
-dist_man_MANS = $(MANUAL_PAGES)
+nodist_man_MANS = $(MANUAL_PAGES)
pkgconfigdir = $(libdir)/pkgconfig
Notice the 'nodist_man_MANS', which causes the generated man pages not
to end up in the dist tarball. As 'EXTRA_DIST' now contains the man .in
files, running ./configure will create the man pages using the provided
prefix. I'll squash up those changes into this patch and apply it all.
Cheers,
Patrik
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
