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

diff --git a/Makefile.am b/Makefile.am
index a31690c..949c402 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,31 @@
-## $Id: Makefile.am,v 1.9 2000-10-02 12:31:43 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 
 
-DIST_SUBDIRS=util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = @SUBDIRS_VAR@
+SUBDIRS = src include util test client ztest zoom doc etc
+
+aclocaldir=$(datadir)/aclocal
+
+aclocal_DATA = m4/yaz.m4
 
 SPEC_FILE=$(PACKAGE).spec
-EXTRA_DIST=$(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
+EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO windows.txt \
+	yaz-config.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
+	Doxyfile.in
 
 dist-hook:
-	cd doc; make
+	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/*.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)