diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-23 12:51:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-23 12:51:15 +0000 |
| commit | 1dfe645d0b5a1f759c7513025843a1a38dee3771 (patch) | |
| tree | 3771e8c9a1f161dd7cdbb53929d697e8fefff4fa /main/mkinitfs/0004-Fix-installation-path-customisation.patch | |
| parent | d031b70d32b89d1ced1b1d2a15195c0720915d5f (diff) | |
| download | aports-1dfe645d0b5a1f759c7513025843a1a38dee3771.tar.bz2 aports-1dfe645d0b5a1f759c7513025843a1a38dee3771.tar.xz | |
main/mkinitfs: backport various fixes from git
Diffstat (limited to 'main/mkinitfs/0004-Fix-installation-path-customisation.patch')
| -rw-r--r-- | main/mkinitfs/0004-Fix-installation-path-customisation.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/main/mkinitfs/0004-Fix-installation-path-customisation.patch b/main/mkinitfs/0004-Fix-installation-path-customisation.patch new file mode 100644 index 0000000000..1ef86c5f59 --- /dev/null +++ b/main/mkinitfs/0004-Fix-installation-path-customisation.patch @@ -0,0 +1,43 @@ +From 5dcea63213712c3ffdc56d4fc3d463955117b828 Mon Sep 17 00:00:00 2001 +From: Ain <41307858+nero@users.noreply.github.com> +Date: Thu, 9 Aug 2018 21:38:09 +0200 +Subject: [PATCH 4/5] Fix installation path customisation + +Previously, datadir was ignored when installing, using the hardcoded +default value. +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 70a48a4..0fa7efd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,7 @@ + + VERSION := 3.3.0 + ++sbindir ?= /sbin + sysconfdir ?= /etc/mkinitfs + datarootdir ?= /usr/share + datadir ?= $(datarootdir)/mkinitfs +@@ -116,13 +117,13 @@ nlplug-findfs: nlplug-findfs.o + + install: $(SBIN_FILES) $(SHARE_FILES) $(CONF_FILES) + for i in $(SBIN_FILES); do \ +- $(INSTALL) -Dm755 $$i $(DESTDIR)/sbin/$$i;\ ++ $(INSTALL) -Dm755 $$i $(DESTDIR)/$(sbindir)/$$i;\ + done + for i in $(CONF_FILES); do \ +- $(INSTALL) -Dm644 $$i $(DESTDIR)/etc/mkinitfs/$$i;\ ++ $(INSTALL) -Dm644 $$i $(DESTDIR)/$(sysconfdir)/$$i;\ + done + for i in $(SHARE_FILES); do \ +- $(INSTALL) -D $$i $(DESTDIR)/usr/share/mkinitfs/$$i;\ ++ $(INSTALL) -D $$i $(DESTDIR)/$(datadir)/$$i;\ + done + for i in $(MAN_FILES); do \ + $(INSTALL) -D $$i $(DESTDIR)$(mandir)/man$${i##*.}/$$i;\ +-- +2.18.0 + |