diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | macros.multiarch | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -22,6 +22,7 @@ PACKAGE = multiarch-utils VERSION := $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec) RELEASE := $(shell rpm -q --qf %{RELEASE} --specfile $(PACKAGE).spec) TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') +MULTIARCH_DIST := $(shell sed -n '/^%define *multiarch_distro *\([0-9]*\)/s//\1/p' $(PACKAGE).spec) RPMOPT = --clean --rmspec @@ -33,7 +34,9 @@ clean: cleandist install: -mkdir -p $(DESTDIR)/etc/rpm - install -m644 $(RPM_MACRO_FILES) $(DESTDIR)/etc/rpm/ + for f in $(RPM_MACRO_FILES); do \ + perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' $$f > $(DESTDIR)/etc/rpm/$$f; \ + done -mkdir -p $(DESTDIR)$(prefix)/lib/rpm install -m755 $(RPM_BIN_FILES) $(DESTDIR)$(prefix)/lib/rpm/ -mkdir -p $(DESTDIR)$(bindir) diff --git a/macros.multiarch b/macros.multiarch index 45fc69e..8cad465 100644 --- a/macros.multiarch +++ b/macros.multiarch @@ -4,7 +4,7 @@ %multiarch_x11bindir %{_prefix}/X11R6/bin/%{multiarch_platform} %multiarch_x11includedir %{_prefix}/X11R6/include/%{multiarch_platform} -%multiarch_distro 1020 +%multiarch_distro %MULTIARCH_DISTRO% %multiarch_binaries() \ %if %{mdkversion} >= %{multiarch_distro} \ |