fixed all path issues

4 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d59b9e52a20a..9804ca1014e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jul  3 17:49:59 UTC 2016
+# Sun Jul  3 20:50:30 UTC 2016
 pkgbase = ntopng
 	pkgdesc = The next generation version of the original ntop, a network traffic probe that shows the network usage
 	pkgver = 2.4
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.ntop.org/
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index dba67cfa2478..b1b6fb957110 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 validpgpkeys=('EFD9413B17293AFDFE6EA6F1402A088DEDF104CB')
 pkgname=ntopng
 pkgver=2.4
-pkgrel=4
+pkgrel=5
 pkgdesc='The next generation version of the original ntop, a network traffic probe that shows the network usage'
 arch=('x86_64' 'i686')
 url='http://www.ntop.org/'
@@ -23,7 +23,8 @@ sha512sums=('515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19
 
 build() {
   cd ntopng-2.4-stable
-  ./autogen.sh && ./configure 
+  ./autogen.sh
+  ./configure --prefix=$pkgdir/usr
   make geoip
   make
 }
@@ -31,9 +32,9 @@ build() {
 package() {
   cd ntopng-2.4-stable
 
-#  make install
-  make DESTDIR="$pkgdir/" install
+  make install
 
+  mv $pkgdir/usr/man $pkgdir/usr/share/
   mkdir -p $pkgdir/usr/lib/systemd/system
   install -m644 "$srcdir/ntopng@.service" "$pkgdir/usr/lib/systemd/system"
 
diff --git a/ntopng@.service b/ntopng@.service
index 9d168273d829..ac6e544f9b83 100644
--- a/ntopng@.service
+++ b/ntopng@.service
@@ -2,7 +2,7 @@
 Description=ntopng network traffic monitor
 
 [Service]
-ExecStart=/usr/local/bin/ntopng -i %I
+ExecStart=/usr/bin/ntopng -i %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ntopng@.service.sig b/ntopng@.service.sig
index 9c3b213d4282..1374bb5307d8 100644
--- a/ntopng@.service.sig
+++ b/ntopng@.service.sig