From: Fedora systemd team <systemd-maint@redhat.com>
Date: Thu, 27 Jun 2013 14:30:12 +0000 (+0200)
Subject: build-sys: install rpm macros file to /usr/lib/rpm/macros.d
X-Git-Tag: v205~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=460c589a92ae58c5cfb4d36dba073220ccdc565f

build-sys: install rpm macros file to /usr/lib/rpm/macros.d

RPM macros are moved from /etc to /usr, in the sprit of moving
in the direction of empty /etc.

RPM gained support for the new directory recently, in v. 4.10.90:
https://bugzilla.redhat.com/show_bug.cgi?id=846679.
---

diff --git a/Makefile.am b/Makefile.am
index 02cd7e2d2..ca4513bdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
-rpmmacrosdir=$(sysconfdir)/rpm
+rpmmacrosdir=$(prefix)/lib/rpm/macros.d
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log