summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--NEWS1
-rw-r--r--macros.multiarch4
3 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fbee58f..beba5b8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,10 @@
prefix = /usr
bindir = $(prefix)/bin
includedir = $(prefix)/include
-rpmmacrodir = $(prefix)/lib/rpm/macros.d
+rpmconfigdir = $(prefix)/lib/rpm
+rpmmacrodir = $(rpmconfigdir)/macros.d
+
+VENDOR ?= mageia
RPM_MACRO_FILES = multiarch
RPM_BIN_FILES = mkmultiarch check-multiarch-files
@@ -33,8 +36,8 @@ install:
for f in $(RPM_MACRO_FILES); do \
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/
+ -mkdir -p $(DESTDIR)$(rpmconfigdir)/$(VENDOR)
+ install -m755 $(RPM_BIN_FILES) $(DESTDIR)$(rpmconfigdir)/$(VENDOR)
-mkdir -p $(DESTDIR)$(bindir)
install -m755 $(BINARIES) $(DESTDIR)$(bindir)/
-mkdir -p $(DESTDIR)$(includedir)
diff --git a/NEWS b/NEWS
index fa87b05..76668a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- install wrapper scripts into /usr/lib/rpm/VENDOR/
- install rpm macros into /usr/lib/rpm/macros.d/
Version 1.0.14 - 11 March 2018, by Jani Välimaa
diff --git a/macros.multiarch b/macros.multiarch
index 2b43acf..6409bf1 100644
--- a/macros.multiarch
+++ b/macros.multiarch
@@ -7,11 +7,11 @@
%multiarch_distro %MULTIARCH_DISTRO%
%multiarch_binaries() \
-%{_prefix}/lib/rpm/mkmultiarch binaries %* \
+%{_rpmconfigdir}/%{_real_vendor}/mkmultiarch binaries %* \
%{nil}
%multiarch_includes() \
-%{_prefix}/lib/rpm/mkmultiarch includes %* \
+%{_rpmconfigdir}/%{_real_vendor}/mkmultiarch includes %* \
%{nil}
%multiarch() \