driverless-fax: don't use a fixed path

diff --git a/Makefile.am b/Makefile.am
index 251f16d01ac84cbb044f47ed5e7081eae55ee32f..87904bf67d3d31dcb9f8bab5feeea22bb07bca53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ EXTRA_DIST = \
        libfontembed.pc.in \
        utils/cups-browsed.service \
        utils/cups-browsed-upstart.conf \
+       utils/driverless-fax.in \
        filter/braille/drivers/index/ubrlto4dot.c \
        filter/braille/filters/TODO.txt
 
@@ -115,6 +116,11 @@ cups_brf_SOURCES = \
 # ==============
 # PPD Generators
 # ==============
+utils/driverless-fax: utils/driverless-fax.in Makefile
+       sed \
+         -e "s|\@CUPS_SERVERBIN\@|$(CUPS_SERVERBIN)|" \
+         $< >$@
+
 pkgppdgendir = $(CUPS_SERVERBIN)/driver
 driverlessfaxscripts = \
        utils/driverless-fax

diff --git a/utils/driverless-fax b/utils/driverless-fax.in
similarity index 65%
rename from utils/driverless-fax
rename to utils/driverless-fax.in
index 637b9527b2ce26d093061bd2dd42f8f1e883c735..e0365f9785eeb6bb724c1aea297830238e68f2d4 100644 (file)
--- a/utils/driverless-fax
+++ b/utils/driverless-fax.in
@@ -10,11 +10,11 @@
 #
 
 if [ $# -eq "0" ]; then
-    DEVICE_TYPE=FAX /usr/lib/cups/backend/driverless
+    DEVICE_TYPE=FAX @CUPS_SERVERBIN@/backend/driverless
     elif [ $# -eq "1" ]; then
-        DEVICE_TYPE=FAX /usr/lib/cups/driver/driverless "$1"
+        DEVICE_TYPE=FAX @CUPS_SERVERBIN@/driver/driverless "$1"
     elif [ $# -eq "2" ]; then
-        DEVICE_TYPE=FAX /usr/lib/cups/driver/driverless "$1" "$2"
+        DEVICE_TYPE=FAX @CUPS_SERVERBIN@/driver/driverless "$1" "$2"
     else
         echo "ERROR: Too many arguments"
 fi