X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=Makefile.am;h=114a1be5e8adc19405550d6a976a9530d842ccb3;hp=78903cbf01bc9e6a9b022431dad6ed62644e6f0b;hb=d372ef83ee1b95f5263f80258b1cb750249ea89f;hpb=480d14d757f48039c49aadf5571d7086c9c91dfb

diff --git a/Makefile.am b/Makefile.am
index 78903cb..114a1be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,16 @@
+# $Id$
+
 ## Process this file with automake to produce Makefile.in
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-if BUILD_LIBINTL
-PO=po
-else
-PO=
-endif
 
-SUBDIRS = $(PO) src examples doc bindings
+SUBDIRS = po src examples doc bindings intl
 
  # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
-             intltool-extract.in  intltool-merge.in    intltool-update.in \
-	     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
@@ -27,21 +23,11 @@ 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/
 
 site-perl-inst: site-perl-install
@@ -54,7 +40,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: