changeset 537:fbc0fc4c9880

system: use new FHS
author David Demelier <markand@malikania.fr>
date Wed, 10 Apr 2019 20:23:00 +0200
parents adaa1ae0fe9d
children 0f8451f3a1e9
files system/accountsservice/accountsservice.sh system/acpid/acpid system/acpid/acpid.sh
diffstat 3 files changed, 10 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/system/accountsservice/accountsservice.sh	Wed Apr 10 20:22:00 2019 +0200
+++ b/system/accountsservice/accountsservice.sh	Wed Apr 10 20:23:00 2019 +0200
@@ -40,7 +40,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D admin_group=wheel \
--- a/system/acpid/acpid	Wed Apr 10 20:22:00 2019 +0200
+++ b/system/acpid/acpid	Wed Apr 10 20:23:00 2019 +0200
@@ -1,23 +1,14 @@
 #!/bin/sh
 #
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
+# /etc/rc.d/template: run control script for acpid
 
-ACPID_CMD=/usr/sbin/acpid
-ACPID_ARGS=--netlink
-ACPID_PID=/var/run/acpid/acpid.pid
+if [ -f /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
+: ${ACPID_CMD:=/bin/acpid}
+: ${ACPID_ARGS:=--netlink}
+: ${ACPID_PID:=/var/run/acpid.pid}
 
 acpid_start()
 {
--- a/system/acpid/acpid.sh	Wed Apr 10 20:22:00 2019 +0200
+++ b/system/acpid/acpid.sh	Wed Apr 10 20:23:00 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 	mkdir -p $DESTDIR/etc/rc.d