[PATCH] gnu: util-macros: Install .pc file in lib/pkgconfig; remove INSTALL file.

[PATCH] gnu: util-macros: Install .pc file in lib/pkgconfig; remove INSTALL file.

[Mark H Weaver]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

This patch fixes 'util-macros' to install its *.pc file in
PREFIX/lib/pkgconfig instead of PREFIX/share/pkgconfig, and to avoid
installing its (standard generic) INSTALL file into
PREFIX/share/util-macros/INSTALL.

     Mark


[-- Attachment #2: [PATCH] gnu: util-macros: Install .pc file in lib/pkgconfig; remove INSTALL file --]
[-- Type: text/x-patch, Size: 2121 bytes --]

From 5dfaa29cfb756de7c8f46f917502bd3a2b6428d3 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Mar 2014 03:52:13 -0400
Subject: [PATCH] gnu: util-macros: Install .pc file in lib/pkgconfig;
 remove INSTALL file.

* gnu/packages/xorg.scm (util-macros): Substitute "$(libdir)/pkgconfig"
  for "$(datadir)/pkgconfig" in Makefile.in.  After install, remove
  share/util-macros/INSTALL and share/util-macros.
---
 gnu/packages/xorg.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 85df02f..ecfbf32 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1742,6 +1743,22 @@ tracking.")
             "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:phases (alist-cons-after
+                 'unpack 'fix-makefile-in
+                 (lambda _
+                   (substitute* "Makefile.in"
+                     ;; Install xorg-macros.pc in PREFIX/lib/pkgconfig,
+                     ;; not PREFIX/share/pkgconfig.
+                     (("\\$\\(datadir\\)/pkgconfig") "$(libdir)/pkgconfig")))
+                 (alist-cons-after
+                  'install 'post-install-cleanup
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let ((out (assoc-ref outputs "out")))
+                      (with-directory-excursion out
+                        (delete-file "share/util-macros/INSTALL")
+                        (rmdir "share/util-macros"))))
+                  %standard-phases))))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
-- 
1.8.4

Re: [PATCH] gnu: util-macros: Install .pc file in lib/pkgconfig; remove INSTALL file.

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> This patch fixes 'util-macros' to install its *.pc file in
> PREFIX/lib/pkgconfig instead of PREFIX/share/pkgconfig, and to avoid
> installing its (standard generic) INSTALL file into
> PREFIX/share/util-macros/INSTALL.

OK to push (rather to core-updates, because it triggers a rebuild of all
X client apps.)

Ludo’.