Mercurial > vanilla
changeset 571:b5566fcdedba
vanilla: fix some FHS issue
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sun, 07 Jul 2019 19:29:50 +0200 |
| parents | 3ef1ae5d014a |
| children | 1d82637c2980 |
| files | core/efibootmgr/efibootmgr.sh core/sysvinit/sysvinit.sh core/tzdata/tzdata.sh |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/efibootmgr/efibootmgr.sh Sat Jul 06 16:55:15 2019 +0200 +++ b/core/efibootmgr/efibootmgr.sh Sun Jul 07 19:29:50 2019 +0200 @@ -36,7 +36,7 @@ # https://git.alpinelinux.org/aports/tree/testing/efibootmgr?h=master patch -p1 < ../efivar.patch CC="$CC" PCDIR=/lib/pkgconfig EFIDIR=/boot/efi make - EFIDIR=/boot/efi DESTDIR=$DESTDIR make install + EFIDIR=/boot/efi DESTDIR=$DESTDIR prefix= sbindir=/bin make install popd rm -rf $PKGNAME-$PKGVERSION
--- a/core/sysvinit/sysvinit.sh Sat Jul 06 16:55:15 2019 +0200 +++ b/core/sysvinit/sysvinit.sh Sun Jul 07 19:29:50 2019 +0200 @@ -35,8 +35,11 @@ patch -p0 < ../disable-components.patch patch -p0 < ../message-style.patch sed -i -e 's|$(ROOT)/sbin|$(ROOT)/bin|g' src/Makefile + sed -i -e 's|$(ROOT)/usr/bin|$(ROOT)/bin|g' src/Makefile + sed -i -e 's|$(ROOT)/usr/sbin|$(ROOT)/bin|g' src/Makefile + sed -i -e 's|$(ROOT)/usr/include|$(ROOT)/include|g' src/Makefile make CC="$CC" CFLAGS="$CFLAGS" - make install ROOT=$DESTDIR + make install ROOT=$DESTDIR MANDIR=/share/man install -Dm0644 ../inittab $DESTDIR/etc/inittab popd
--- a/core/tzdata/tzdata.sh Sat Jul 06 16:55:15 2019 +0200 +++ b/core/tzdata/tzdata.sh Sun Jul 07 19:29:50 2019 +0200 @@ -35,7 +35,7 @@ tar xvaf ../tzcode$PKGVERSION.tar.gz make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" - make install DESTDIR=$DESTDIR + make install DESTDIR=$DESTDIR USRDIR= popd rm -rf $PKGNAME-$PKGVERSION