diff options
| author | Vinicius Costa Gomes <vcgomes@gmail.com> | 2015-03-25 15:46:35 -0300 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-03-31 13:58:28 +0300 |
| commit | a0c806fc56d37566f954ccdc87a0af15a6d0359b (patch) | |
| tree | 5b4539939d3a88671b9cd43cbda794ea7e436448 /Makefile.am | |
| parent | 00f50d8624420232248c530987466a791cac5809 (diff) | |
| download | connman-a0c806fc56d37566f954ccdc87a0af15a6d0359b.tar.gz | |
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]
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 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)/$< $@ |