* gnu/packages/cups.scm (cups-filters): Update to look for the test page template in the cups-filter output dir, as cups and cups-filter do not share an output dir. --- gnu/packages/cups.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index e51dcb5..d22338d 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -56,17 +56,21 @@ (snippet ;; install backends, banners and filters to cups-filters output ;; directory, not the cups server directory - '(substitute* "Makefile.in" - (("CUPS_DATADIR = @CUPS_DATADIR@") - "CUPS_DATADIR = $(PREFIX)/share/cups") - (("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)") - "pkgcupsserverrootdir = $(PREFIX)") - ;; Choose standard directories notably so that binaries are - ;; stripped. - (("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend") - "pkgbackenddir = $(PREFIX)/lib/cups/backend") - (("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter") - "pkgfilterdir = $(PREFIX)/lib/cups/filter"))))) + '(begin + (substitute* "Makefile.in" + (("CUPS_DATADIR = @CUPS_DATADIR@") + "CUPS_DATADIR = $(PREFIX)/share/cups") + (("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)") + "pkgcupsserverrootdir = $(PREFIX)") + ;; Choose standard directories notably so that binaries are + ;; stripped. + (("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend") + "pkgbackenddir = $(PREFIX)/lib/cups/backend") + (("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter") + "pkgfilterdir = $(PREFIX)/lib/cups/filter")) + (substitute* "configure.ac" + (("BANNERTOPDF_DATADIR, \"\\{CUPS_DATADIR\\}/data\"") + "BANNERTOPDF_DATADIR, \"{PREFIX}/share/cups/data\"")))))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "PREFIX=" %output)) -- 2.10.1