From ef2f51a445b23c8d9b8298e325bcc8cc7bb18ac0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 27 Jun 2015 19:31:59 +0200
Subject: gnu: cups-filter: Install backends and filters under lib/cups.

This ensures that they are stripped during the 'strip' phase, thereby removing
references to GCC and linux-libre-headers that would otherwise be found in
debugging symbols.

* gnu/packages/cups.scm (cups-filters)[source]: Change pkgbackenddir and
  pkgfilterdir to $(PREFIX)/lib/cups/{filter,backend}.
  (cups)[arguments]: Adjust accordingly.
---
 gnu/packages/cups.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 05b129d6a9..8d86cd6bad 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,10 +55,12 @@ (define-public cups-filters
                    "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)/backend")
+                   "pkgbackenddir = $(PREFIX)/lib/cups/backend")
                   (("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter")
-                   "pkgfilterdir = $(PREFIX)/filter")))))
+                   "pkgfilterdir = $(PREFIX)/lib/cups/filter")))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags (list (string-append "PREFIX=" %output))
@@ -196,7 +199,7 @@ (define-public cups
                 (string-append
                  "for dir in "
                  (assoc-ref %outputs "out") "/lib/cups/filter "
-                 filters "/filter"))
+                 filters "/lib/cups/filter"))
 
                ;; check for charsets in cups-filters output
                (("/usr/share/cups/charsets")
@@ -264,15 +267,16 @@ (define-public cups
                (lambda (f)
                  (symlink f
                           (string-append out "/lib/cups/filter" (basename f))))
-               (find-files (string-append cups-filters "/filter") ".*"))
+               (find-files (string-append cups-filters "/lib/cups/filter")))
 
               ;; backends
               (for-each
                (lambda (f)
                  (symlink (string-append cups-filters f)
-                          (string-append out "/lib/cups" f)))
-               '("/backend/parallel"
-                 "/backend/serial"))
+                          (string-append out "/lib/cups/backend/"
+                                         (basename f))))
+               '("/lib/cups/backend/parallel"
+                 "/lib/cups/backend/serial"))
 
               ;; banners
               (let ((banners "/share/cups/banners"))
-- 
cgit v1.2.3