src/rrd_fetch.c: Use "rrdc_fetch" if daemon is available.

[rrdtool.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c1a12cf..720daed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,16 @@
+# $Id$
+
 ## Process this file with automake to produce Makefile.in
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
 
-SUBDIRS = po src examples doc bindings intl
+SUBDIRS = po src examples doc bindings
 
  # 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/Makefile win32/config.h \
-             win32/rrd.dsp win32/rrd.sln win32/rrd.vcproj \
+            rrdtool.spec favicon.ico  win32/Makefile win32/config.h autogen.sh \
+             win32/rrd.dsp win32/rrd.sln win32/rrd.vcproj libtool \
              win32/rrd_config.h.msvc win32/rrdlib.vcproj win32/rrdtool.dsp \
              win32/rrdtool.dsw win32/rrdtool.vcproj netware/Makefile  \
              etc/rrdcached-default etc/rrdcached-init
@@ -32,10 +34,6 @@ to-docs: to-versync
 to-dist: to-docs dist
        mv $(PACKAGE)-$(VERSION).tar.gz archive
 
-to-scp: to-dist
-       cp CHANGES  archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/
-       (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz)
-
 #      $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
 
 site-perl-inst: site-perl-install
@@ -48,7 +46,7 @@ site-tcl-install: all
        cd bindings/tcl && $(MAKE) tcl-install
 
 site-python-install: all
-       cd bindings/python && $(PYTHON) setup.py install
+       cd bindings/python && $(PYTHON) setup.py install $(if $(DESTDIR),--root=$(DESTDIR))
 
 # find . -name "*.c" -or -name "*.h" | xargs perl -0777 -n -e 'while (s/typedef\s+(?:unsigned\s+|signed\s+|unival\s+)?\S+\s+\*?([^{}\s;(]+)//){print "-T$1\n"}'
 indent: