From dd20248c9da02ec9ca2f4177ede0464e44a780e3 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 11 Apr 2020 23:48:51 -0700
Subject: Adjust prefix

---
 PKGBUILD                 | 18 ++++++++++--------
 icecream-scheduler.initd |  2 +-
 icecream.initd           |  2 +-
 ld-icecream.conf         |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index c6a28f7..f1c9d84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,12 @@
 # # I maintain this because:
 # AUR version not configured for openRC
 # AUR version uses excess scripts
+# AUR version uses faulty prefix
 
 pkgname=icecream
 _exname=$pkgname-scheduler
 pkgver=1.3.1
-pkgrel=1.2
+pkgrel=1.3
 pkgdesc="Distributed compiler with a central scheduler to share build load"
 url="https://github.com/icecc/icecream"
 license=('GPL2')
@@ -36,11 +37,11 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/icecc/$pkgname/archive/$pkgv
         icecream-scheduler.xml
         )
 b2sums=('d7d66dadf27b0b88ab706bf217ce2b0d33b5db2ed95e48c4e9dcbd000931688ad6809ecbd4e14f0f3889bcebddc8543bd364c9dda09ba71e5dc04d0a5a2122d5'
-        'a2c931315fa807f6e7372822283a35eb591f538a9e3ac467040e7037e7342639f35aaddd778ad9c09e07296d78cc8cd91cf58f19f98a8819784cf8f1153b2084'
+        '35780f1b485bee29b30352373b505115ee648be531b8cf06d1544a41aa233909845c509e63be5761a90be300518ca3f4fca775c4f9785b3d394a47373ba1b2af'
         '529b8edbaf2e1c1b3adc54abc691c34280be91f1d627d3d898a4c960119f6a1131b5392fff7c8ce204d8265a9852e9cd0d4a47241de47ef1deb9669ee8088d7e'
-        '328245a843752bcceea2414627427f3b899af5fce986dd6abe37ae050d06e50e87a32a915a8a08c8dfb66e49e9439429fbe7922b844a5e04deaee5fbf728b029'
+        '6c0fbb36f737ff7f03e4d631a6b92d47370a14d0c7587cb2273e05b4bf1413dec7db6e68d5467a83e7ecf4c14aa1bde0d8bfb643b3e458e7d6a8147a267c3652'
         'b0d5f38d49a410ca5c45ebd2c073697833bccdf5da48fb8724e4cccecfbda85e53a431ed802535bcc2fb337656d6581508c63394d8338a40b3620cb00657a022'
-        '6402d7968df89e189ab453e0b0dd3ecec693bfaa982f04672c504036a7379147f97a84e1107e2d3ee393b63a7ea7f11155eca07254d74c20d849292c605bf973'
+        '863828162cd3ad6a55f6a83ba0e07e9b15b14c99301f25ef5d8a085dde3adcaa49976063be34bf131afebea95a8a19bd6bf1113fb76bf80d8299ebc62b9bc30e'
         '7087aaeacdc5589fce8f993ca959ea62510bf43702269f860a2fd477b1b63b89503e1c65071654e9a14069940120d0a080d42d2993451f15e58648f2d14a573b'
         '632e229678c991e19a9bd5eb263ae1cffbc3df0ba0f23d0d6033ecb18cc85719d6a56eec486026b8524f77d3a049d21469958b158a869a06df3d528f04dd4f31'
         'f955f378a5dded1b3552760aa5b55352fe85ced57b1f6743c723c7b24b3ef95ff25e4d321db1d30f4e506e6002c0f53a0ffc7bb4d997f8a72bfe802349ae96ef')
@@ -48,7 +49,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./autogen.sh
-  ./configure --prefix=/usr/lib/$pkgname --enable-shared --disable-static --mandir=/usr/share/man
+  ./configure --prefix=/usr --enable-shared --disable-static --mandir=/usr/share/man
   make
 }
 
@@ -62,9 +63,10 @@ package() {
   install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir/etc/conf.d/$pkgname"
   install -D -m644 "$srcdir"/ld-$pkgname.conf "${pkgdir}/etc/ld.so.conf.d/$pkgname.conf"
 
-  # moving pkg-config file to its usual place
-  install -D -m644 "${pkgdir}/usr/lib/$pkgname/lib/pkgconfig/icecc.pc" "${pkgdir}/usr/lib/pkgconfig/icecc.pc"
-  rm -rf "${pkgdir}/usr/lib/$pkgname/lib/pkgconfig"
+  # Move sbin to bin
+  install -D -m755 "${pkgdir}/usr/sbin/iceccd" "${pkgdir}/usr/bin/iceccd"
+  install -D -m755 "${pkgdir}/usr/sbin/icecc-scheduler" "${pkgdir}/usr/bin/icecc-scheduler"
+  rm -rf "${pkgdir}/usr/sbin"
   
   # place the firewalld service rulesets
   install -D -m644 "$srcdir"/icecream.xml "$pkgdir/usr/lib/firewalld/services/icecream.xml"
diff --git a/icecream-scheduler.initd b/icecream-scheduler.initd
index e71776a..45865cd 100644
--- a/icecream-scheduler.initd
+++ b/icecream-scheduler.initd
@@ -2,7 +2,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command="/usr/lib/icecream/sbin/icecc-scheduler"
+command="/usr/bin/icecc-scheduler"
 command_args="${ICECREAM_SCHEDULER_OPTS}"
 pidfile="/run/${RC_SVCNAME}.pid"
 start_stop_daemon_args="--background --make-pidfile"
diff --git a/icecream.initd b/icecream.initd
index 1ff49e9..c0db732 100644
--- a/icecream.initd
+++ b/icecream.initd
@@ -2,7 +2,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command="/usr/lib/icecream/sbin/iceccd"
+command="/usr/bin/iceccd"
 command_args="${ICECREAM_OPTS}"
 pidfile="/run/${RC_SVCNAME}.pid"
 start_stop_daemon_args="--background --make-pidfile"
diff --git a/ld-icecream.conf b/ld-icecream.conf
index e720df3..0bf940b 100644
--- a/ld-icecream.conf
+++ b/ld-icecream.conf
@@ -1 +1 @@
-/usr/lib/icecream/lib
+/usr/lib
-- 
cgit v1.2.1