diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | scripts/connman.in | 2 | ||||
| -rw-r--r-- | src/net.connman.service.in | 2 | ||||
| -rw-r--r-- | vpn/connman-vpn.service.in | 2 | ||||
| -rw-r--r-- | vpn/net.connman.vpn.service.in | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 4e4f6ac2..507736d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -153,7 +153,7 @@ vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/vpn/vpn.ver endif -BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) +BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) scripts/connman if VPN BUILT_SOURCES += vpn/builtin.h @@ -221,7 +221,7 @@ src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf \ plugins/connman-nmcompat.conf \ - $(service_files_sources) + $(service_files_sources) scripts/connman.in if VPN vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \ @@ -451,6 +451,9 @@ do_subst = $(AM_V_GEN)$(SED) \ %.service: %.service.in Makefile $(do_subst) < $< > $@ +scripts/connman: 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 dd4b2719..cec10bf4 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 ec98f391..1692b950 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 e76969bc..f7f6a7c0 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 3778d51c..de65a70d 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 fc9e9bf3..e473ea9e 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 |