ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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

28
gnu/packages/cups.scm
View file

@ -64,17 +64,23 @@ (define-public cups-filters
(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
(("CUPS_DATADIR = @CUPS_DATADIR@") (substitute* "Makefile.in"
"CUPS_DATADIR = $(PREFIX)/share/cups") (("CUPS_DATADIR = @CUPS_DATADIR@")
(("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)") "CUPS_DATADIR = $(PREFIX)/share/cups")
"pkgcupsserverrootdir = $(PREFIX)") (("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)")
;; Choose standard directories notably so that binaries are "pkgcupsserverrootdir = $(PREFIX)")
;; stripped. ;; Choose standard directories notably so that binaries are
(("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend") ;; stripped.
"pkgbackenddir = $(PREFIX)/lib/cups/backend") (("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend")
(("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter") "pkgbackenddir = $(PREFIX)/lib/cups/backend")
"pkgfilterdir = $(PREFIX)/lib/cups/filter"))))) (("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/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))