aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorAndy Wingo <wingo@igalia.com>2016-10-10 15:29:59 +0200
committerLudovic Courtès <ludo@gnu.org>2016-10-10 23:47:03 +0200
commit085cca5bc1d8ca6b3d7d01e4a5c4f0f3886e7fbc (patch)
tree93938bd13235f221c950f2ea9973bcc2d74bb9b0 /gnu
parentd68dacd9cced73bff653284d5196793ef16c0e77 (diff)
downloadguix-085cca5bc1d8ca6b3d7d01e4a5c4f0f3886e7fbc.tar
guix-085cca5bc1d8ca6b3d7d01e4a5c4f0f3886e7fbc.tar.gz
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>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/cups.scm28
1 files changed, 17 insertions, 11 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 9f1ffd1778..2050c9b7e7 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -64,17 +64,23 @@
(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"))
+ ;; 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)
(arguments
`(#:make-flags (list (string-append "PREFIX=" %output))