aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2014-02-05 08:38:27 +0100
committerGuido Günther <agx@sigxcpu.org>2014-02-05 08:38:27 +0100
commit14d771b90f5a7d3887e5e900d1fb4737477ad305 (patch)
treef382e3359d20916ae60d28361e59635e373224f8 /Makefile.am
parenta09050a7f63a262bf90dcb1c7a41f9cfd205db43 (diff)
Imported Upstream version 0.5.2.0upstream/0.5.2.0
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index bcfca11..19289b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,10 +32,11 @@ dbusservice_DATA = org.freedesktop.ModemManager.conf
dbusservice_file_polkit = org.freedesktop.ModemManager.conf.polkit
dbusservice_file_nopolkit = org.freedesktop.ModemManager.conf.nopolkit
-org.freedesktop.ModemManager.conf:
if WITH_POLKIT
+org.freedesktop.ModemManager.conf: $(top_srcdir)/$(dbusservice_file_polkit)
cp -f $(top_srcdir)/$(dbusservice_file_polkit) $(dbusservice_DATA)
else
+org.freedesktop.ModemManager.conf: $(top_srcdir)/$(dbusservice_file_nopolkit)
cp -f $(top_srcdir)/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
endif
@@ -55,7 +56,7 @@ include/mm-modem.h: $(XMLS) introspection/all.xml header-generator.xsl
$(edit) $< >$@
xmldir = $(datadir)/dbus-1/interfaces
-xml_DATA = $(filter-out introspection/all.xml, $(XMLS))
+xml_DATA = $(filter-out introspection/all.xml introspection/org.freedesktop.DBus.Properties.xml, $(XMLS))
edit = @sed \
-e 's|@sbindir[@]|$(sbindir)|g' \