nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: cups-filters: Look for test page in own output dir. 

* 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.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Andy Wingo 2016-10-10 15:29:59 +02:00 committed by Ludovic Courtès
parent d68dacd9cc
commit 085cca5bc1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/cups.scm
View File

@ -64,7 +64,8 @@
(snippet (snippet
;; install backends, banners and filters to cups-filters output ;; install backends, banners and filters to cups-filters output
;; directory, not the cups server directory ;; directory, not the cups server directory
'(substitute* "Makefile.in" '(begin
(substitute* "Makefile.in"
(("CUPS_DATADIR = @CUPS_DATADIR@") (("CUPS_DATADIR = @CUPS_DATADIR@")
"CUPS_DATADIR = $(PREFIX)/share/cups") "CUPS_DATADIR = $(PREFIX)/share/cups")
(("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)") (("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)")
@ -74,7 +75,12 @@
(("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend") (("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend")
"pkgbackenddir = $(PREFIX)/lib/cups/backend") "pkgbackenddir = $(PREFIX)/lib/cups/backend")
(("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter") (("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter")
"pkgfilterdir = $(PREFIX)/lib/cups/filter"))))) "pkgfilterdir = $(PREFIX)/lib/cups/filter"))
;; Find bannertopdf data such as the print test page in our
;; output directory, not CUPS's prefix.
(substitute* "configure"
(("\\{CUPS_DATADIR\\}/data")
"{prefix}/share/cups/data"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" %output)) `(#:make-flags (list (string-append "PREFIX=" %output))