X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.am;h=949c4020aa98ad9f9227a89c61a9e20f4666d5cd;hp=81da99e74a8419ac6bbfd84fa3a02f0de258e691;hb=ba1eb985bfd53a8cfbfd251e65688921dba56236;hpb=08516fefc3253bf9e414fecb48f475fa26b8869a

diff --git a/Makefile.am b/Makefile.am
index 81da99e..949c402 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,31 @@
-## Copyright (C) 1994-2004, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.27 2004-03-29 20:11:13 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1994-2005, Index Data, All rights reserved.
+## $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
+	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
 
-rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba $(SPEC_FILE)