From d156fbb1829655bb7fdcd02e8bf3be1c48806c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= Date: Sun, 7 Aug 2005 16:13:27 +0000 Subject: fix compat mode for 10.2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8da6736..b2c93cd 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ BINARIES = multiarch-platform multiarch-dispatch INCLUDES = multiarch-dispatch.h XCONFIGS = multiarch-dispatch-host.def OTHER_FILES = Makefile multiarch-utils.spec ChangeLog -FILES = $(RPM_MACRO_FILES) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(XCONFIGS) $(OTHER_FILES) +FILES = $(foreach file,$(RPM_MACRO_FILES),macros.$(file)) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(XCONFIGS) $(OTHER_FILES) PACKAGE = multiarch-utils VERSION := $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec) @@ -35,7 +35,7 @@ clean: cleandist install: -mkdir -p $(DESTDIR)/etc/rpm for f in $(RPM_MACRO_FILES); do \ - perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' $$f > $(DESTDIR)/etc/rpm/macros.$$f; \ + perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' macros.$$f > $(DESTDIR)/etc/rpm/macros.$$f; \ if [[ -f /etc/rpm/macros.d/mandriva-release.macros ]]; then \ mkdir -p $(DESTDIR)/etc/rpm/macros.d; \ mv $(DESTDIR)/etc/rpm/macros.$$f $(DESTDIR)/etc/rpm/macros.d/$$f.macros; \ -- cgit v1.2.1