02/04: gnu: pciutils: Move 'pci.ids.gz' to 'share/hwdata'.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 841e06af71d264b5fbec56f96aec8aa933fbeab2
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jul 10 10:37:48 2017 +0200

    gnu: pciutils: Move 'pci.ids.gz' to 'share/hwdata'.
    
    * gnu/packages/pciutils.scm (pciutils)[arguments] <configure>: Set
    'IDSDIR' such that 'pci.ids.gz' goes to share/hwdata.
---
 gnu/packages/pciutils.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index a3d85e8..51962d2 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -56,12 +56,18 @@
                  ;; $prefix/share/man, and wrongly so.
                 (string-append "MANDIR := " (assoc-ref outputs "out")
                                "/share/man\n"))
+
                (("^SHARED=.*$")
                 ;; Build libpciutils.so.
                 "SHARED := yes\n")
                (("^ZLIB=.*$")
-                ;; Ask for zlib support.
-                "ZLIB := yes\n"))))
+                ;; Ask for zlib support, for 'pci.ids.gz' decompression.
+                "ZLIB := yes\n")
+
+               (("^IDSDIR=.*$")
+                ;; Installation directory of 'pci.ids.gz'.
+                "IDSDIR = $(SHAREDIR)/hwdata\n"))
+             #t))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Install the commands, library, and .pc files.