Commit 6b7098c6 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Pasi Sjöholm

build: Fix using '@prefix@/sbin' instead of '@sbindir@

This solves the problem of '496f134ac1001dd2af17b1ee7172643be80edbae'
for all the generated files, while trying to be safe against partially
expanded variables.

(Patrik: Added init script handling to EXTRA_DIST and BUILT_SOURCES)
parent b763b1fa
......@@ -155,7 +155,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
......@@ -224,7 +224,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@ \
......@@ -465,6 +465,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)/$< $@
......
......@@ -447,5 +447,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)
#!/bin/sh
DAEMON=@prefix@/sbin/connmand
DAEMON=@sbindir@/connmand
DESC="Connection Manager"
. /lib/lsb/init-functions
......
[D-BUS Service]
Name=net.connman
Exec=@prefix@/sbin/connmand -n
Exec=@sbindir@/connmand -n
User=root
SystemdService=connman.service
......@@ -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]
......
[D-BUS Service]
Name=net.connman.vpn
Exec=@prefix@/sbin/connman-vpnd -n
Exec=@sbindir@/connman-vpnd -n
User=root
SystemdService=connman-vpn.service
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment