X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.am;h=949c4020aa98ad9f9227a89c61a9e20f4666d5cd;hp=7f9b87da4349ec89e8a72ed2d06ce67512b0db6e;hb=ba1eb985bfd53a8cfbfd251e65688921dba56236;hpb=84d7b06c13daa609e93f353e655c4b02f936d65c

diff --git a/Makefile.am b/Makefile.am
index 7f9b87d..949c402 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,31 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2005, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.31 2005-04-22 08:27:57 adam Exp $
+## $Id: Makefile.am,v 1.36 2006-06-15 14:15:17 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src include util test client ztest zoom doc etc
 
 aclocaldir=$(datadir)/aclocal
 
-aclocal_DATA = yaz.m4
+aclocal_DATA = m4/yaz.m4
 
 SPEC_FILE=$(PACKAGE).spec
 EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO windows.txt \
-	yaz-config.in yaz.m4 buildconf.sh Doxyfile.in
+	yaz-config.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
+	Doxyfile.in
 
 dist-hook:
+	if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; fi
 	mkdir $(distdir)/win
 	-cp $(srcdir)/win/* $(distdir)/win
 	mkdir $(distdir)/debian
 	cp $(srcdir)/debian/control $(distdir)/debian
 	cp $(srcdir)/debian/changelog $(distdir)/debian
 	cp $(srcdir)/debian/rules $(distdir)/debian
-	cp $(srcdir)/debian/postinst $(distdir)/debian
-	cp $(srcdir)/debian/compat $(distdir)/debian
+	cp $(srcdir)/debian/*.postinst $(distdir)/debian
 	cp $(srcdir)/debian/*.install $(distdir)/debian
+	cp $(srcdir)/debian/*.manpages $(distdir)/debian