diff options
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | NEWS | 2 |
2 files changed, 5 insertions, 6 deletions
@@ -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/ @@ -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 |