Ensure package installs to /usr/local entirely

4 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a94f20abf8ea..07fec6ef19d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Jul  3 09:10:16 UTC 2016
+# Sun Jul  3 17:48:07 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
@@ -25,7 +25,7 @@ pkgbase = ntopng
 	source = ntopng-2.4-stable.tar.gz.sig
 	source = ntopng@.service.sig
 	sha512sums = 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
-	sha512sums = b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60
+	sha512sums = cb83d75e867c28bfaa6d5a6bea60660d75fe35c96bb3c000c3ce947c1e34352914f0e5231e07b875cb4c613071a5d1988cc582410898704b5e065575d67c05b4
 	sha512sums = SKIP
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 290d960219c3..e5ece0693e88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,13 +17,13 @@ makedepends=('glib2' 'automake' 'libtool' 'geoip' 'libpcap' 'wget' 'libxml2' 'sq
 source=("http://downloads.sourceforge.net/project/ntop/ntopng/ntopng-2.4-stable.tar.gz" "ntopng@.service" "ntopng-2.4-stable.tar.gz.sig" "ntopng@.service.sig")
 
 sha512sums=('515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a'
-            'b3d9a2032cce91ee4faf81522a30a2877540b3fc7a0d43f8fe4f01c16efb0b8f6e73cfe26028b3a070296d7156abf511d3e11f93635ca2de8a4d67322b0ade60'
+            'cb83d75e867c28bfaa6d5a6bea60660d75fe35c96bb3c000c3ce947c1e34352914f0e5231e07b875cb4c613071a5d1988cc582410898704b5e065575d67c05b4'
             'SKIP'
             'SKIP')
 
 build() {
   cd ntopng-2.4-stable
-  ./autogen.sh && ./configure --prefix=$pkgdir/usr
+  ./autogen.sh && ./configure 
   make geoip
   make
 }
@@ -31,7 +31,8 @@ build() {
 package() {
   cd ntopng-2.4-stable
 
-  make install
+#  make install
+  make DESTDIR="$pkgdir/" install
 
   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 ac6e544f9b83..9d168273d829 100644
--- a/ntopng@.service
+++ b/ntopng@.service
@@ -2,7 +2,7 @@
 Description=ntopng network traffic monitor
 
 [Service]
-ExecStart=/usr/bin/ntopng -i %I
+ExecStart=/usr/local/bin/ntopng -i %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ntopng@.service.sig b/ntopng@.service.sig
index a30b57df9ca7..9c3b213d4282 100644
--- a/ntopng@.service.sig
+++ b/ntopng@.service.sig