a few leanups -- Bernhard Fischer

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

diff --git a/program/Makefile.am b/program/Makefile.am
index 1c879946d82ca243fba68a7fee61e35a197d092f..9599b1301e7a24c87e2a00621b7c7385ebcc5762 100644 (file)
--- a/program/Makefile.am
+++ b/program/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/program/examples/Makefile.am b/program/examples/Makefile.am
index 9e7dc840ec7e443ded94e337d8200d44fa9081f9..e568965841c1d1f7f797e8f3d4bd309b7e854e32 100644 (file)
--- a/program/examples/Makefile.am
+++ b/program/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/program/examples/perftest.pl.in b/program/examples/perftest.pl.in
index 41186e1a6404a7a03a25f43597e14491c15eddd4..022a954473a8270b37d320d7a3c04218144d4ffc 100755 (executable)
--- a/program/examples/perftest.pl.in
+++ b/program/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