From 62c2cc48e6a34c596e1e5a0bd0f873cd3d3f9218 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 7 Jul 2015 14:20:54 -0400
Subject: [PATCH] gnu: zathura-{cb,ps,djvu,pdf-poppler}: Fix installation of
 desktop files.

Based on a patch by Alex Kost <alezost@gmail.com>.

* 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 | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 82e8c88..6cdc846 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -172,8 +172,9 @@
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+       `(,(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)))
@@ -203,8 +204,9 @@ using libarchive.")
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+       `(,(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)))
@@ -235,8 +237,9 @@ using libspectre.")
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+       `(,(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)))
@@ -268,8 +271,9 @@ using the DjVuLibre library.")
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
-          "PLUGINDIR=/lib/zathura" "CC=gcc")
+       `(,(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)))
-- 
2.4.3