01/01: gnu: zathura-{cb, ps, djvu, pdf-poppler}: Fix installation of desktop files.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit b1982b80ca8d230d43c514803df726fb0a36a227
Author: Mark H Weaver <address@hidden>
Date:   Tue Jul 7 14:20:54 2015 -0400

    gnu: zathura-{cb,ps,djvu,pdf-poppler}: Fix installation of desktop files.
    
    Based on a patch by Alex Kost <address@hidden>.
    
    * gnu/packages/pdf.scm (zathura-cb, zathura-ps, zathura-djvu)
      (zathura-pdf-poppler)[arguments]: In make-flags, set PREFIX instead of
      DESTDIR and adjust PLUGINDIR accordingly.
---
 gnu/packages/pdf.scm |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 82e8c88..5412813 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -171,9 +171,9 @@
               ("zathura" ,zathura)))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+     `(#:make-flags (list (string-append "PREFIX=" %output)
+                          (string-append "PLUGINDIR=" %output "/lib/zathura")
+                          "CC=gcc")
        #:tests? #f ; Package does not contain tests.
        #:phases
        (alist-delete 'configure %standard-phases)))
@@ -202,9 +202,9 @@ using libarchive.")
               ("zathura" ,zathura)))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+     `(#:make-flags (list (string-append "PREFIX=" %output)
+                          (string-append "PLUGINDIR=" %output "/lib/zathura")
+                          "CC=gcc")
        #:tests? #f ; Package does not contain tests.
        #:phases
        (alist-delete 'configure %standard-phases)))
@@ -234,9 +234,9 @@ using libspectre.")
        ("zathura" ,zathura)))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+     `(#:make-flags (list (string-append "PREFIX=" %output)
+                          (string-append "PLUGINDIR=" %output "/lib/zathura")
+                          "CC=gcc")
        #:tests? #f ; Package does not contain tests.
        #:phases
        (alist-delete 'configure %standard-phases)))
@@ -267,9 +267,9 @@ using the DjVuLibre library.")
        ("cairo" ,cairo)))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+     `(#:make-flags (list (string-append "PREFIX=" %output)
+                          (string-append "PLUGINDIR=" %output "/lib/zathura")
+                          "CC=gcc")
        #:tests? #f ; Package does not include tests.
        #:phases
        (alist-delete 'configure %standard-phases)))