Commit 62147a89 authored by John Ferlito's avatar John Ferlito
Browse files

Rever INSTPREFIX

parent aa8a8c8e
...@@ -3,41 +3,40 @@ Date: Fri, 22 Feb 2013 15:55:27 +1100 ...@@ -3,41 +3,40 @@ Date: Fri, 22 Feb 2013 15:55:27 +1100
Subject: Debianise install paths Subject: Debianise install paths
--- ---
etc/nfsen-dist.conf | 26 +++++++++++++------------- etc/nfsen-dist.conf | 24 ++++++++++++------------
1 file changed, 13 insertions(+), 13 deletions(-) 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/etc/nfsen-dist.conf b/etc/nfsen-dist.conf diff --git a/etc/nfsen-dist.conf b/etc/nfsen-dist.conf
index cf08470..b1b279e 100644 index cf08470..7d78caa 100644
--- a/etc/nfsen-dist.conf --- a/etc/nfsen-dist.conf
+++ b/etc/nfsen-dist.conf +++ b/etc/nfsen-dist.conf
@@ -18,25 +18,25 @@ @@ -18,7 +18,7 @@
# #
# Required for default layout # Required for default layout
-$BASEDIR = "/data/nfsen"; -$BASEDIR = "/data/nfsen";
+$BASEDIR = "debian/nfsen"; +$BASEDIR = "debian/nfsen/usr";
# #
# Where to install the NfSen binaries # Where to install the NfSen binaries
-$BINDIR="${BASEDIR}/bin"; @@ -26,17 +26,17 @@ $BINDIR="${BASEDIR}/bin";
+$BINDIR="${BASEDIR}/usr/bin";
# #
# Where to install the NfSen Perl modules # Where to install the NfSen Perl modules
-$LIBEXECDIR="${BASEDIR}/libexec"; -$LIBEXECDIR="${BASEDIR}/libexec";
+$LIBEXECDIR="${BASEDIR}/usr/share/perl5/nfsen"; +$LIBEXECDIR="${BASEDIR}/share/perl5/nfsen";
# #
# Where to install the config files # Where to install the config files
-$CONFDIR="${BASEDIR}/etc"; -$CONFDIR="${BASEDIR}/etc";
+$CONFDIR="${BASEDIR}/etc/nfsen"; +$CONFDIR="debian/nfsen/etc/nfsen";
# #
# NfSen html pages directory: # NfSen html pages directory:
# All php scripts will be installed here. # All php scripts will be installed here.
# URL: Entry point for nfsen: http://<webserver>/nfsen/nfsen.php # URL: Entry point for nfsen: http://<webserver>/nfsen/nfsen.php
-$HTMLDIR = "/var/www/nfsen/"; -$HTMLDIR = "/var/www/nfsen/";
+$HTMLDIR = "${BASEDIR}/usr/share/nfsen/www"; +$HTMLDIR = "${BASEDIR}/share/nfsen/www";
# #
# Where to install the docs # Where to install the docs
...@@ -46,7 +45,7 @@ index cf08470..b1b279e 100644 ...@@ -46,7 +45,7 @@ index cf08470..b1b279e 100644
# #
# Var space for NfSen # Var space for NfSen
-$VARDIR="${BASEDIR}/var"; -$VARDIR="${BASEDIR}/var";
+$VARDIR="${BASEDIR}/var/lib/nfsen"; +$VARDIR="debian/nfsen/var/lib/nfsen";
# directory for all pid files # directory for all pid files
# $PIDDIR="$VARDIR/run"; # $PIDDIR="$VARDIR/run";
...@@ -74,7 +73,7 @@ index cf08470..b1b279e 100644 ...@@ -74,7 +73,7 @@ index cf08470..b1b279e 100644
# #
# nfdump tools path # nfdump tools path
-$PREFIX = '/usr/local/bin'; -$PREFIX = '/usr/local/bin';
+$PREFIX = "${BASEDIR}/usr/bin"; +$PREFIX = "${BASEDIR}/bin";
# #
# nfsend communication socket # nfsend communication socket
......
...@@ -7,7 +7,7 @@ Subject: Empty sources list ...@@ -7,7 +7,7 @@ Subject: Empty sources list
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/nfsen-dist.conf b/etc/nfsen-dist.conf diff --git a/etc/nfsen-dist.conf b/etc/nfsen-dist.conf
index b1b279e..f4bb3e2 100644 index 7d78caa..9abcc28 100644
--- a/etc/nfsen-dist.conf --- a/etc/nfsen-dist.conf
+++ b/etc/nfsen-dist.conf +++ b/etc/nfsen-dist.conf
@@ -160,9 +160,9 @@ $PROFILERS = 6; @@ -160,9 +160,9 @@ $PROFILERS = 6;
......
...@@ -9,7 +9,7 @@ Subject: Add config snippet functionality ...@@ -9,7 +9,7 @@ Subject: Add config snippet functionality
create mode 100644 etc/nfsen.d/README create mode 100644 etc/nfsen.d/README
diff --git a/etc/nfsen-dist.conf b/etc/nfsen-dist.conf diff --git a/etc/nfsen-dist.conf b/etc/nfsen-dist.conf
index e9f6947..fc96386 100644 index 9abcc28..0a85153 100644
--- a/etc/nfsen-dist.conf --- a/etc/nfsen-dist.conf
+++ b/etc/nfsen-dist.conf +++ b/etc/nfsen-dist.conf
@@ -300,4 +300,9 @@ Alert '@alert@' triggered at timeslot @timeslot@ @@ -300,4 +300,9 @@ Alert '@alert@' triggered at timeslot @timeslot@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment