Fix maintainer mode and script directory location

diff --git a/Makefile.am b/Makefile.am
index 6579a81..086de01 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,19 +69,27 @@ CLEANFILES = src/connman.ver src/connman.exp src/connman.conf \
 
 statedir = $(localstatedir)/run/connman
 
-storagedir = $(localstatedir)/lib/connman
-
 plugindir = $(libdir)/connman/plugins
 
 scriptdir = $(libdir)/connman/scripts
 
+storagedir = $(localstatedir)/lib/connman
+
+if MAINTAINER_MODE
+build_plugindir = $(abs_top_srcdir)/plugins/.libs
+build_scriptdir = $(abs_top_srcdir)/scripts
+else
+build_plugindir = $(plugindir)
+build_scriptdir = $(scriptdir)
+endif
+
 AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @DBUS_CFLAGS@ \
-                       @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ $(builtin_cflags) \
-                                       -DCONNMAN_PLUGIN_BUILTIN \
-                                       -DSTATEDIR=\""$(statedir)"\" \
-                                       -DPLUGINDIR=\""$(plugindir)"\" \
-                                       -DSCRIPTDIR=\""$(scriptdir)"\" \
-                                       -DSTORAGEDIR=\""$(storagedir)\""
+               @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ $(builtin_cflags) \
+                               -DCONNMAN_PLUGIN_BUILTIN \
+                               -DSTATEDIR=\""$(statedir)"\" \
+                               -DPLUGINDIR=\""$(build_plugindir)"\" \
+                               -DSCRIPTDIR=\""$(build_scriptdir)"\" \
+                               -DSTORAGEDIR=\""$(storagedir)\""
 
 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 

diff --git a/Makefile.plugins b/Makefile.plugins
index 29f9df7..6df38a3 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -144,7 +144,8 @@ plugin_LTLIBRARIES += plugins/udhcp.la
 plugin_objects += $(plugins_udhcp_la_OBJECTS)
 plugins_udhcp_la_SOURCES = plugins/udhcp.c plugins/task.h plugins/task.c
 plugins_udhcp_la_CFLAGS = $(plugin_cflags) -DUDHCPC=\"@UDHCPC@\" \
-               -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+                                       -DSTATEDIR=\""$(statedir)"\" \
+                                       -DSCRIPTDIR=\""$(build_scriptdir)"\"
 plugins_udhcp_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
@@ -158,7 +159,8 @@ else
 plugin_LTLIBRARIES += plugins/dhclient.la
 plugin_objects += $(plugins_dhclient_la_OBJECTS)
 plugins_dhclient_la_CFLAGS = $(plugin_cflags) -DDHCLIENT=\"@DHCLIENT@\" \
-               -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+                                       -DSTATEDIR=\""$(statedir)"\" \
+                                       -DSCRIPTDIR=\""$(built_scriptdir)"\"
 plugins_dhclient_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif