diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-08-07 16:04:24 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-08-07 16:04:24 +0000 |
| commit | c053a7c733728cc1e06c8d5894370204ca3a1d19 (patch) | |
| tree | 7e1e5fbfae9c4fe0213d144019529b1cfe893106 /Makefile | |
| parent | 106e6fcc00647566998a4224a307d9a453a9db30 (diff) | |
| download | multiarch-utils-c053a7c733728cc1e06c8d5894370204ca3a1d19.tar multiarch-utils-c053a7c733728cc1e06c8d5894370204ca3a1d19.tar.gz multiarch-utils-c053a7c733728cc1e06c8d5894370204ca3a1d19.tar.bz2 multiarch-utils-c053a7c733728cc1e06c8d5894370204ca3a1d19.tar.xz multiarch-utils-c053a7c733728cc1e06c8d5894370204ca3a1d19.zip | |
adapt for rpm4.4 glob /etc/rpm/macros.d/*.macros
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -10,7 +10,7 @@ prefix = /usr bindir = $(prefix)/bin includedir = $(prefix)/include -RPM_MACRO_FILES = macros.multiarch +RPM_MACRO_FILES = multiarch RPM_BIN_FILES = mkmultiarch check-multiarch-files BINARIES = multiarch-platform multiarch-dispatch INCLUDES = multiarch-dispatch.h @@ -35,7 +35,11 @@ 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/$$f; \ + perl -pe 's/%MULTIARCH_DISTRO%/$(MULTIARCH_DIST)/' $$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; \ + fi; \ done -mkdir -p $(DESTDIR)$(prefix)/lib/rpm install -m755 $(RPM_BIN_FILES) $(DESTDIR)$(prefix)/lib/rpm/ |