From bb99de6b1bba3192ab81db6a65bdb8e8e568c6b7 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Sun, 24 Jan 2010 11:43:27 +0000
Subject: =?UTF-8?q?fix=20broken=20check=20for=20rpm/macros.d=20directory?=
 =?UTF-8?q?=20(from=20Per=20=C3=98yvind=20Karlsen)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 2 +-
 NEWS     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1cd2b55..48a6b1e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ install:
 	-mkdir -p $(DESTDIR)/etc/rpm
 	for f in $(RPM_MACRO_FILES); do \
 	  perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' macros.$$f > $(DESTDIR)/etc/rpm/macros.$$f; \
-	  if [[ -f /etc/rpm/macros.d/mandriva-release.macros ]]; then \
+	  if [[ -d /etc/rpm/macros.d ]]; then \
 	    mkdir -p $(DESTDIR)/etc/rpm/macros.d; \
 	    mv $(DESTDIR)/etc/rpm/macros.$$f $(DESTDIR)/etc/rpm/macros.d/$$f.macros; \
 	  fi; \
diff --git a/NEWS b/NEWS
index 06c80ec..169e8ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,3 @@
 - remove dispatch file for host.def, it is no longer used
 - fix broken sparc64 check (from Per Øyvind Karlsen, #27277)
+- fix broken check for rpm/macros.d directory (from Per Øyvind Karlsen)
-- 
cgit v1.2.1