summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-01-24 11:43:27 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-01-24 11:43:27 +0000
commitbb99de6b1bba3192ab81db6a65bdb8e8e568c6b7 (patch)
treea3c944dba11fc9488768f6021e2f3b31a1f37530
parent8c492167a44fb84b5424773fb897c1515b3b2e70 (diff)
downloadmultiarch-utils-bb99de6b1bba3192ab81db6a65bdb8e8e568c6b7.tar
multiarch-utils-bb99de6b1bba3192ab81db6a65bdb8e8e568c6b7.tar.gz
multiarch-utils-bb99de6b1bba3192ab81db6a65bdb8e8e568c6b7.tar.bz2
multiarch-utils-bb99de6b1bba3192ab81db6a65bdb8e8e568c6b7.tar.xz
multiarch-utils-bb99de6b1bba3192ab81db6a65bdb8e8e568c6b7.zip
fix broken check for rpm/macros.d directory (from Per Øyvind Karlsen)
-rw-r--r--Makefile2
-rw-r--r--NEWS1
2 files changed, 2 insertions, 1 deletions
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)