From 324a91f663be483c8efecae9e641f0e45382c4fc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 26 Aug 2020 08:37:36 +0200 Subject: [PATCH] driverless-fax: don't use a fixed path --- Makefile.am | 6 ++++++ utils/{driverless-fax => driverless-fax.in} | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) rename utils/{driverless-fax => driverless-fax.in} (65%) diff --git a/Makefile.am b/Makefile.am index 251f16d01..87904bf67 100644 --- 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 637b9527b..e0365f978 100644 --- 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 -- 2.47.2