unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 1/3] gnu: cups-filters: Look for test page in own output dir.
@ 2016-10-10 13:29 Andy Wingo
  2016-10-10 13:30 ` [PATCH 2/3] gnu: cups-filters: Use ghostscript with CUPS driver Andy Wingo
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Andy Wingo @ 2016-10-10 13:29 UTC (permalink / raw)
  To: guix-devel

* 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 | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index e51dcb5..3ce1157 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -56,17 +56,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 in our output directory, not CUPS's
+                  ;; prefix.
+                  (substitute* '("configure.ac" "configure")
+                    (("\\{CUPS_DATADIR\\}/data")
+                     "{PREFIX}/share/cups/data"))))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags (list (string-append "PREFIX=" %output))
-- 
2.10.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 1/3] gnu: cups-filters: Look for test page in own output dir.
@ 2016-10-07 20:24 Andy Wingo
  2016-10-07 20:24 ` [PATCH 2/3] gnu: cups-filters: Use ghostscript with CUPS driver Andy Wingo
  0 siblings, 1 reply; 7+ messages in thread
From: Andy Wingo @ 2016-10-07 20:24 UTC (permalink / raw)
  To: guix-devel

* 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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-10-10 21:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-10 13:29 [PATCH 1/3] gnu: cups-filters: Look for test page in own output dir Andy Wingo
2016-10-10 13:30 ` [PATCH 2/3] gnu: cups-filters: Use ghostscript with CUPS driver Andy Wingo
2016-10-10 13:30 ` [PATCH 3/3] gnu: Add CUPS service Andy Wingo
2016-10-10 21:50 ` [PATCH 1/3] gnu: cups-filters: Look for test page in own output dir Ludovic Courtès
  -- strict thread matches above, loose matches on Subject: below --
2016-10-07 20:24 Andy Wingo
2016-10-07 20:24 ` [PATCH 2/3] gnu: cups-filters: Use ghostscript with CUPS driver Andy Wingo
2016-10-09 14:17   ` Ricardo Wurmus
2016-10-10 12:50   ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).