X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 27DA1DC065D for ; Mon, 10 Aug 2015 19:30:02 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 7177EDC00B8; Mon, 10 Aug 2015 19:30:00 +0000 (UTC) Received: from localhost (ip5f5ac946.dynamic.kabel-deutschland.de [95.90.201.70]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id 8e70d327; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Mon, 10 Aug 2015 21:29:58 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/xdm: store xdm configuration in /etc/X11/xdm Date: Mon, 10 Aug 2015 21:29:19 +0200 Message-Id: <1439234959-6672-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.5.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Configuration files belong in /etc and not in /usr/lib --- main/xdm/APKBUILD | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/main/xdm/APKBUILD b/main/xdm/APKBUILD index 7d124c3..0322e9c 100644 --- a/main/xdm/APKBUILD +++ b/main/xdm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Johannes Matheis pkgname=xdm pkgver=1.1.11 -pkgrel=1 +pkgrel=2 pkgdesc="X Display Manager" url="http://xorg.freedesktop.org/" arch="all" @@ -23,7 +23,7 @@ source=" _builddir="${srcdir}"/"${pkgname}"-"${pkgver}" prepare() { - local i + local i= cd "$_builddir" for i in $source; do case $i in @@ -41,6 +41,7 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --enable-ipv6 \ + --with-xdmconfigdir=/etc/X11/${pkgname} \ --with-pam \ || return 1 make || return 1 @@ -48,21 +49,23 @@ build() { package() { cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/lib/X11/xdm/*.la + install -D -m755 "$srcdir"/${pkgname}.initd \ "$pkgdir"/etc/init.d/${pkgname} || return 1 install -D -m644 "$srcdir"/Xresources.alpinelinux \ - "$pkgdir"/usr/lib/X11/${pkgname}/Xresources.alpinelinux \ - || return 1 + "$pkgdir"/etc/X11/${pkgname}/Xresources.alpinelinux \ + || return 1 install -D -m644 "$srcdir"/Xresources.alpinelinux_old \ - "$pkgdir"/usr/lib/X11/${pkgname}/Xresources.alpinelinux_old \ - || return 1 + "$pkgdir"/etc/X11/${pkgname}/Xresources.alpinelinux_old \ + || return 1 install -D -m644 "$srcdir"/alpinelinux_old_blue_black.xpm \ - "$pkgdir"/usr/lib/X11/${pkgname}/pixmaps/alpinelinux_old_blue_black.xpm \ + "$pkgdir"/etc/X11/${pkgname}/pixmaps/alpinelinux_old_blue_black.xpm \ || return 1 install -D -m644 "$srcdir"/alpinelinux_white_blue.xpm \ - "$pkgdir"/usr/lib/X11/${pkgname}/pixmaps/alpinelinux_white_blue.xpm \ + "$pkgdir"/etc/X11/${pkgname}/pixmaps/alpinelinux_white_blue.xpm \ || return 1 } -- 2.5.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---