X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile.am;h=6e4c6d1bc885af6af8657de9b43baeaa9e5c228a;hb=d02fa05385c5bc77f4faafd2117bdba699e15cbf;hp=e8376094ca93eb5b04e8381eac0122b68799c82a;hpb=b3f24b6b29adb7722dd5eb66a68f1df14907166b;p=yaz-moved-to-github.git

diff --git a/Makefile.am b/Makefile.am
index e837609..6e4c6d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,22 @@
-## $Id: Makefile.am,v 1.16 2002-09-25 07:43:29 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1994-2005, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.32 2006-03-30 16:30:25 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
-SUBDIRS = util odr comstack z39.50 ill zutil ccl tab retrieval server include lib client ztest zoom doc
+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 CHANGELOG TODO windows.txt \
-	yaz-config.in yaz.m4
+EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO windows.txt \
+	yaz-config.in m4/yaz.m4 buildconf.sh Doxyfile.in
 
 dist-hook:
-	cd doc; make
 	mkdir $(distdir)/win
 	-cp $(srcdir)/win/* $(distdir)/win
 	mkdir $(distdir)/debian
@@ -21,7 +24,6 @@ dist-hook:
 	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/*.install $(distdir)/debian
 
-rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba $(SPEC_FILE)