This solves the problem of '496f134ac1001dd2af17b1ee7172643be80edbae'
for all the generated files, while trying to be safe against partially
expanded variables.
---
Does it still make sense to maintain scripts/connman?
That '$(EXEEXT)' thing was the only way I found to keep it from warning.
Makefile.am | 5 ++++-
configure.ac | 3 +--
scripts/connman.in | 2 +-
src/net.connman.service.in | 2 +-
vpn/connman-vpn.service.in | 2 +-
vpn/net.connman.vpn.service.in | 2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index eac5611..f14defc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -232,7 +232,7 @@ endif
EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf
script_DATA =
-script_PROGRAMS =
+script_PROGRAMS = scripts/connman
script_LTLIBRARIES =
include Makefile.plugins
@@ -440,6 +440,9 @@ do_subst = $(AM_V_GEN)$(SED) \
%.service: %.service.in Makefile
$(do_subst) < $< > $@
+scripts/connman$(EXEEXT): scripts/connman.in Makefile
+ $(do_subst) < $< > $@
+
include/connman/version.h: include/version.h
$(AM_V_at)$(MKDIR_P) include/connman
$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
diff --git a/configure.ac b/configure.ac
index dd4b271..cec10bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,5 +384,4 @@ AM_CONDITIONAL(VPN, test "${enable_openconnect}" != "no" -o
\
"${enable_l2tp}" != "no" -o \
"${enable_pptp}" != "no")
-AC_OUTPUT(Makefile include/version.h scripts/connman
- connman.pc)
+AC_OUTPUT(Makefile include/version.h connman.pc)
diff --git a/scripts/connman.in b/scripts/connman.in
index ec98f39..1692b95 100644
--- a/scripts/connman.in
+++ b/scripts/connman.in
@@ -1,6 +1,6 @@
#!/bin/sh
-DAEMON=@prefix@/sbin/connmand
+DAEMON=@sbindir@/connmand
DESC="Connection Manager"
. /lib/lsb/init-functions
diff --git a/src/net.connman.service.in b/src/net.connman.service.in
index e76969b..f7f6a7c 100644
--- a/src/net.connman.service.in
+++ b/src/net.connman.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=net.connman
-Exec=@prefix@/sbin/connmand -n
+Exec=@sbindir@/connmand -n
User=root
SystemdService=connman.service
diff --git a/vpn/connman-vpn.service.in b/vpn/connman-vpn.service.in
index 3778d51..de65a70 100644
--- a/vpn/connman-vpn.service.in
+++ b/vpn/connman-vpn.service.in
@@ -6,7 +6,7 @@ After=dbus.socket
[Service]
Type=dbus
BusName=net.connman.vpn
-ExecStart=@prefix@/sbin/connman-vpnd -n
+ExecStart=@sbindir@/connman-vpnd -n
StandardOutput=null
[Install]
diff --git a/vpn/net.connman.vpn.service.in b/vpn/net.connman.vpn.service.in
index fc9e9bf..e473ea9 100644
--- a/vpn/net.connman.vpn.service.in
+++ b/vpn/net.connman.vpn.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=net.connman.vpn
-Exec=@prefix@/sbin/connman-vpnd -n
+Exec=@sbindir@/connman-vpnd -n
User=root
SystemdService=connman-vpn.service
--
2.3.3
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
