a few leanups -- Bernhard Fischer

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1200 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/Makefile.am b/Makefile.am
index 1c87994..9599b13 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,11 @@ RSYNC = rsync --rsh=ssh
 # build the following subdirectories
 SUBDIRS = src doc examples bindings
 
-  # the following files are not mentioned in any other Makefile
+ # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
-            rrdtool.spec favicon.ico win32/config.h win32/rrd.dsp win32/rrd.vcproj \
-            win32/rrdtool.dsp win32/rrdtool.dsw win32/rrdtool.vcproj win32/Makefile \
+            rrdtool.spec favicon.ico win32/config.h win32/rrd.dsp \
+            win32/rrd.vcproj win32/rrdtool.dsp win32/rrdtool.dsw \
+            win32/rrdtool.vcproj win32/Makefile \
             win32/rrd_config.h.msvc netware/Makefile
 
             

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9e7dc84..e568965 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -10,7 +10,7 @@ examplesdir = $(pkgdatadir)/examples
 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
        stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
 
-cgi-demo.cgi: cgi-demo.cgi.in $(top_builddir)/config.status
-       sed 's,@''exec_prefix@,$(exec_prefix),' cgi-demo.cgi.in > $@
+cgi-demo.cgi: @srcdir@/cgi-demo.cgi.in $(top_builddir)/config.status
+       sed 's,@''exec_prefix@,$(exec_prefix),' @srcdir@/cgi-demo.cgi.in > $@
        chmod a+x $@
 

diff --git a/examples/perftest.pl.in b/examples/perftest.pl.in
index 41186e1..022a954 100755 (executable)
--- a/examples/perftest.pl.in
+++ b/examples/perftest.pl.in
@@ -19,7 +19,7 @@ Running on $RRDs::VERSION;
 
 RRDtool update performance is ultimately disk-bound. Since very little data
 does actually get written to disk in a single update, the performance
-is highly dependent on the cache situation in your machine.
+is highly dependent on the cache situation of your machine.
 
 This test tries to cater for this. It works like this:
 
@@ -36,8 +36,8 @@ you should see a slowdown as data has to be read from disk.
 The growning number in the second column shows how many RRD have been
 updated ... If everything is in cache, the number will Jump to $Chunk almost
 immediately. Then the system will seem to hang as 'sync' runs, to make sure
-all data has been written to disk prior to the next perftest run. This many
-not be 100% real-life, so you may want to remove the sync, just for fun
+all data has been written to disk prior to the next perftest run. This may
+not be 100% real-life, so you may want to remove the sync just for fun
 (then it is even less real-life, but different)
 
 NOTE