Install to proper paths

2 files changed, 10 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index aefbe80a5f90..d8b76dc1c35d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,10 +17,16 @@ makedepends=('php-embed' 'python' 'go')
 
 build() {
   cd "$srcdir"/$_shortname-$pkgver
-  ./configure --prefix=/usr --sbindir=/usr/bin
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --modules="/usr/lib/$pkgbase" \
+              --state="/var/lib/$pkgbase" \
+              --pid="/run/$pkgbase.pid" \
+              --log="/var/log/$pkgbase.log" \
+              --control="/run/$pkgbase.control.sock"
   ./configure python
   ./configure php
-  ./configure go
+  ./configure go --go-path=/usr/lib/go
   make all
 }
 
diff --git a/unit.service b/unit.service
index e7f1e1c5a3a2..57c2e872d671 100644
--- a/unit.service
+++ b/unit.service
@@ -5,8 +5,8 @@ After=network-online.target
 
 [Service]
 Type=forking
-PIDFile=/run/unit.pid
-ExecStart=/usr/sbin/unitd --control unix:/run/control.unit.sock --log /var/log/unit.log --pid /run/unit.pid
+PIDFile=/run/nginx-unit.pid
+ExecStart=/usr/sbin/unitd --control unix:/run/nginx-unit.control.sock --pid /run/nginx-unit.pid
 ExecReload=
 
 [Install]