complete segfault fix for second axis %s format begun in r2123 (thanks Martin Pelikan...

[rrdtool.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1c87994..11d16d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,20 @@
+# $Id$
+
 ## Process this file with automake to produce Makefile.in
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-SUBDIRS = src doc examples 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/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
+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 autogen.sh \
+             libtool \
+             netware/Makefile  \
+             etc/rrdcached-default etc/rrdcached-init \
+             win32/Makefile  win32/config.h  win32/rrdlib.vcproj  win32/rrdtool.vcproj  win32/rrdupdate.vcproj \
+             win32/README    win32/rrd.sln   win32/rrdtool.sln    win32/rrdupdate.sln 
 
 CLEANFILES = config.cache
 
@@ -18,23 +22,19 @@ CLEANFILES = config.cache
 AUTOMAKE_OPTIONS= foreign 
 
 # where we keep local rules for automake
-
+ACLOCAL_AMFLAGS=-I m4
 ACLOCAL_M4= $(top_srcdir)/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
 #AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
 
-to-docs: to-versync
-       (cd doc && $(MAKE) clean && $(MAKE) && $(MAKE) pdf)
-
-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/
 
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = \
+       etc/rrdcached.socket \
+       etc/rrdcached.service
+endif
+
 site-perl-inst: site-perl-install
 
 site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
@@ -45,7 +45,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: