From 14d771b90f5a7d3887e5e900d1fb4737477ad305 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Wed, 5 Feb 2014 08:38:27 +0100 Subject: Imported Upstream version 0.5.2.0 --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile.am') 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' \ -- cgit v1.2.3