diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | macros.rpm-helper.in (renamed from rpm-helper.macros.in) | 0 |
3 files changed, 8 insertions, 5 deletions
@@ -6,7 +6,7 @@ SCRIPT_FILES = add-user del-user create-file \ add-group del-group add-shell del-shell verify-shell \ add-syslog del-syslog add-webapp del-webapp \ get-password create-ssl-certificate -MACROS_FILES = rpm-helper.macros +MACROS_FILES = macros.rpm-helper CONF_FILES = ssl TEST_FILES = t/*.t SYSTEMDMIGRATION_FILES = README.systemd @@ -15,7 +15,7 @@ FILES = AUTHORS README COPYING NEWS Makefile \ $(TEST_FILES) $(SYSTEMDMIGRATION_FILES) pkgdatadir = /usr/share/$(PACKAGE) -rpmmacrosdir = /etc/rpm/macros.d +rpmmacrodir = /usr/lib/rpm/macros.d sysconfigdir = /etc/sysconfig systemdmigrationdir = /var/lib/rpm-helper/systemd-migration @@ -25,14 +25,14 @@ all: install: $(MACROS_FILES) install -d -m 755 $(DESTDIR)$(pkgdatadir) cp -p $(SCRIPT_FILES) $(DESTDIR)$(pkgdatadir) - install -d -m 755 $(DESTDIR)$(rpmmacrosdir) - install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrosdir) + install -d -m 755 $(DESTDIR)$(rpmmacrodir) + install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrodir) install -d -m 755 $(DESTDIR)$(sysconfigdir) install -m 644 $(CONF_FILES) $(DESTDIR)/$(sysconfigdir) install -d -m 755 $(DESTDIR)$(systemdmigrationdir) install -m 644 $(SYSTEMDMIGRATION_FILES) $(DESTDIR)/$(systemdmigrationdir) -rpm-helper.macros: rpm-helper.macros.in +macros.rpm-helper: macros.rpm-helper.in sed -e 's:@pkgdatadir@:$(pkgdatadir):' < $< > $@ clean: @@ -1,3 +1,6 @@ + * rename rpm-helper.macros as macros.rpm-helper and install it into + /usr/lib/rpm/macros.d + 2020-12-20 Guillaume Rousse <guillomovitch@gmail.com> 0.24.21 * revert default key length for SSL certificates to 2048 bits, as it is enough until 2030 according to NIST and other experts: diff --git a/rpm-helper.macros.in b/macros.rpm-helper.in index 1703bc4..1703bc4 100644 --- a/rpm-helper.macros.in +++ b/macros.rpm-helper.in |