summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-07-24 03:14:15 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-07-24 03:14:15 +0000
commit13c85ca1a342f6f72f4ea45fbbcfd9899685a98b (patch)
tree658691cfdb2d40c6220a3df8d39e4530ebfe7b66
parent876f8a08f4c40d56ee87e4bf643a0181e2ae1788 (diff)
parent0cd3f92bdd6f7a694ab25cdace2481c840d2c3ea (diff)
downloadpackages-13c85ca1a342f6f72f4ea45fbbcfd9899685a98b.tar.gz
packages-13c85ca1a342f6f72f4ea45fbbcfd9899685a98b.tar.bz2
packages-13c85ca1a342f6f72f4ea45fbbcfd9899685a98b.tar.xz
packages-13c85ca1a342f6f72f4ea45fbbcfd9899685a98b.zip
Merge branch 'lr.sysconfdir' into 'master'
Don't install files to /usr/etc/ See merge request adelie/packages!296
-rw-r--r--system/attr/APKBUILD5
-rw-r--r--user/i3status/APKBUILD5
-rw-r--r--user/mplayer/APKBUILD2
3 files changed, 8 insertions, 4 deletions
diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD
index 9dccb1415..1d4997a5d 100644
--- a/system/attr/APKBUILD
+++ b/system/attr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=attr
pkgver=2.4.48
-pkgrel=0
+pkgrel=1
pkgdesc="Utilities for managing filesystem extended attributes"
url="https://savannah.nongnu.org/projects/attr"
arch="all"
@@ -29,7 +29,8 @@ build() {
--libdir=/lib \
--includedir=/usr/include \
--mandir=/usr/share/man \
- --datadir=/usr/share
+ --datadir=/usr/share \
+ --sysconfdir=/etc
make
}
diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD
index b892fef2f..422c1dfd4 100644
--- a/user/i3status/APKBUILD
+++ b/user/i3status/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=i3status
pkgver=2.13
-pkgrel=0
+pkgrel=1
pkgdesc="Status bar generator for dzen2, xmobar or similar"
url="https://i3wm.org/i3status/"
arch="all"
@@ -28,7 +28,8 @@ build() {
PATH_ASCIIDOC=/usr/bin/asciidoctor ../configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr
+ --prefix=/usr \
+ --sysconfdir=/etc
make
}
diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD
index 8fb03660a..6b6ce9a71 100644
--- a/user/mplayer/APKBUILD
+++ b/user/mplayer/APKBUILD
@@ -28,12 +28,14 @@ build() {
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
+ --confdir=/etc/mplayer \
--disable-ffmpeg_a
make
}
package() {
make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/etc"
}
sha512sums="8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 MPlayer-1.4.tar.xz"