summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2023-01-07 13:46:31 +0200
committerJani Välimaa <wally@mageia.org>2023-01-07 13:46:31 +0200
commit3989884dc13bd53b9ce96dd9305cbde406cd10d1 (patch)
tree6a746baeed0ee029270b6ab3d291cdfddeb7858d
parent4001fcf5194a040b1bf2ed7047d14854070160a6 (diff)
downloadmultiarch-utils-3989884dc13bd53b9ce96dd9305cbde406cd10d1.tar
multiarch-utils-3989884dc13bd53b9ce96dd9305cbde406cd10d1.tar.gz
multiarch-utils-3989884dc13bd53b9ce96dd9305cbde406cd10d1.tar.bz2
multiarch-utils-3989884dc13bd53b9ce96dd9305cbde406cd10d1.tar.xz
multiarch-utils-3989884dc13bd53b9ce96dd9305cbde406cd10d1.zip
Install rpm macros into /usr/lib/rpm/macros.d/
-rw-r--r--Makefile9
-rw-r--r--NEWS2
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e0f8292..fbee58f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@
prefix = /usr
bindir = $(prefix)/bin
includedir = $(prefix)/include
+rpmmacrodir = $(prefix)/lib/rpm/macros.d
RPM_MACRO_FILES = multiarch
RPM_BIN_FILES = mkmultiarch check-multiarch-files
@@ -28,13 +29,9 @@ clean: cleandist
rm -f *~
install:
- -mkdir -p $(DESTDIR)/etc/rpm
+ -mkdir -p $(DESTDIR)$(rpmmacrodir)
for f in $(RPM_MACRO_FILES); do \
- perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' macros.$$f > $(DESTDIR)/etc/rpm/macros.$$f; \
- 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; \
+ perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' macros.$$f > $(DESTDIR)$(rpmmacrodir)/macros.$$f; \
done
-mkdir -p $(DESTDIR)$(prefix)/lib/rpm
install -m755 $(RPM_BIN_FILES) $(DESTDIR)$(prefix)/lib/rpm/
diff --git a/NEWS b/NEWS
index 0cfe2c5..fa87b05 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- install rpm macros into /usr/lib/rpm/macros.d/
+
Version 1.0.14 - 11 March 2018, by Jani Välimaa
- add support for aarch64