Skip to content

Commit 4f9d92a

Browse files
committed
Make D-Bus service file respect configure flags
Fixes #28
1 parent a77d3b6 commit 4f9d92a

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

Makefile.am

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ cupshelpers/config.py: cupshelpers/config.py.in Makefile
5252
-e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
5353
$< > $@
5454

55+
dbus/org.fedoraproject.Config.Printing.service: dbus/org.fedoraproject.Config.Printing.service.in
56+
sed \
57+
-e "s|\@bindir\@|$(bindir)|" \
58+
$< >$@
59+
5560
# Use distutils to build the module.
5661
all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py
5762
$(PYTHON) setup.py build
@@ -286,6 +291,7 @@ EXTRA_DIST=\
286291
udev/udev-add-printer \
287292
udev/70-printers.rules \
288293
udev/configure-printer@.service.in \
294+
dbus/org.fedoraproject.Config.Printing.service.in \
289295
xml/preferreddrivers.xml \
290296
test_PhysicalDevice.py \
291297
$(appdata_in_files)
@@ -402,7 +408,8 @@ DISTCLEANFILES=*.pyc *.pyo *~ *.bak \
402408
intltool-extract intltool-merge intltool-update \
403409
*.desktop man/*.1 \
404410
test-ppd-module.sh test-xml-validity.sh py.test.sh pickled-ppds \
405-
config.py cupshelpers/config.py zanata.xml
411+
config.py cupshelpers/config.py zanata.xml \
412+
dbus/org.fedoraproject.Config.Printing.service
406413

407414
distclean-local:
408415
rm -rf html
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[D-BUS Service]
22
Name=org.fedoraproject.Config.Printing
3-
Exec=/usr/bin/scp-dbus-service
3+
Exec=@bindir@/scp-dbus-service

0 commit comments

Comments
 (0)