X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.am;h=8d42df1d3e092b3738cad3a6fcab21d70c55ae36;hp=0ab6318c47e00c10ba6011e20ed35e8b292c883e;hb=af895ebea6200bb5a752ae312b83a6f78edfad08;hpb=d7c297ae11eae74257636c143bb7e02041c00f59

diff --git a/Makefile.am b/Makefile.am
index 0ab6318..8d42df1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,29 @@
-## $Id: Makefile.am,v 1.12 2001-11-20 09:25:45 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1994-2005, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.34 2006-04-21 14:24:53 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
-DIST_SUBDIRS=util odr z39.50 ill zutil comstack ccl tab retrieval server lib zoom 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 = 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
-	-cp $(srcdir)/debian/* $(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)