Index: ossp-pkg/flow2rrd/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/ChangeLog,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/12/26 18:40:39	1.3
+++ ChangeLog	2004/12/26 18:52:45	1.4
@@ -10,6 +10,13 @@
 
   Changes between 0.9.0 and 0.9.1 (24-Dec-2004 to xx-Dec-2004):
 
+    *) Adjust default configuration path.
+       [Ralf S. Engelschall]
+
+    *) Create "localstatedir" under "make install" and
+       place default RRD into this directory.
+       [Ralf S. Engelschall]
+
     *) Fix syntax of default configuration.
        [Ralf S. Engelschall]
 
Index: ossp-pkg/flow2rrd/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/Makefile.in,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/Makefile.in,v' 2>/dev/null
--- Makefile.in	2004/12/26 15:20:00	1.2
+++ Makefile.in	2004/12/26 18:52:45	1.3
@@ -27,22 +27,23 @@
 @SET_MAKE@
 
 #   installation paths
-DESTDIR     =
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-bindir      = @bindir@
-sysconfdir  = @sysconfdir@
-libdir      = @libdir@
-includedir  = @includedir@
-mandir      = @mandir@
+DESTDIR       =
+prefix        = @prefix@
+exec_prefix   = @exec_prefix@
+bindir        = @bindir@
+sysconfdir    = @sysconfdir@
+libdir        = @libdir@
+includedir    = @includedir@
+mandir        = @mandir@
+localstatedir = @localstatedir@
 
 #   build tools
-RM          = rm -f
-RMDIR       = rmdir
-SHTOOL      = ./shtool
-TRUE        = true
-PERL        = @PERL@
-POD2MAN     = @POD2MAN@
+RM            = rm -f
+RMDIR         = rmdir
+SHTOOL        = ./shtool
+TRUE          = true
+PERL          = @PERL@
+POD2MAN       = @POD2MAN@
 
 #   default targets
 all: flow2rrd flow2rrd.1
@@ -53,6 +54,7 @@
 	V=`$(SHTOOL) version -l txt -d long VERSION`; \
 	sed -e "s;@PERL\@;$(PERL);g" \
 	    -e "s;@POD2MAN\@;$(POD2MAN);g" \
+	    -e "s;@SYSCONFDIR\@;$(sysconfdir);g" \
 	    -e "s;@VERSION\@;$$V;g" \
 	    <flow2rrd.pl >flow2rrd && chmod a+x flow2rrd
 
@@ -68,14 +70,15 @@
 	sed -e "s;FLOW2RRD_VERSION_STR;$$V2;" >flow2rrd.1
 
 #   perform installation procedure
-install:
+install: all
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(sysconfdir)
+	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(localstatedir)
 	$(SHTOOL) install -c -m 755 flow2rrd $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 flow2rrd.1 $(DESTDIR)$(mandir)/man1/
-	$(SHTOOL) install -c -m 644 flow2rrd.cfg $(DESTDIR)$(sysconfdir)/
+	$(SHTOOL) install -c -m 644 -e 's;@LOCALSTATEDIR\@;$(localstatedir);g' flow2rrd.cfg $(DESTDIR)$(sysconfdir)/
 
 #   perform uninstallation procedure
 uninstall:
@@ -86,6 +89,7 @@
 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
 	-$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
 	-$(RMDIR) $(DESTDIR)$(sysconfdir) >/dev/null 2>&1 || $(TRUE)
+	-$(RMDIR) $(DESTDIR)$(localstatedir) >/dev/null 2>&1 || $(TRUE)
 	-$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
 
 #   perform build clean up procedure
Index: ossp-pkg/flow2rrd/flow2rrd.cfg
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.cfg,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.cfg,v' 2>/dev/null
--- flow2rrd.cfg	2004/12/26 18:40:39	1.4
+++ flow2rrd.cfg	2004/12/26 18:52:45	1.5
@@ -3,7 +3,7 @@
 ##
 
 #   Round-Robin Database
-Database /var/tmp/flow2rrd.rrd;
+Database @LOCALSTATEDIR@/flow2rrd.rrd;
 
 #   Protocol Definitions
 Protocol icmp     1;
Index: ossp-pkg/flow2rrd/flow2rrd.pl
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pl,v
rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pl,v' 2>/dev/null
--- flow2rrd.pl	2004/12/26 17:09:13	1.8
+++ flow2rrd.pl	2004/12/26 18:52:45	1.9
@@ -59,7 +59,7 @@
 my $opt = {
     -help     => 0,
     -version  => 0,
-    -config   => 'flow2rrd.cfg',
+    -config   => '@SYSCONFDIR@/flow2rrd.cfg',
     -store    => 0,
     -graph    => 0,
     -cgi      => (($ENV{'GATEWAY_INTERFACE'} || "") eq 'CGI/1.1' ? 1 : 0)