Revert

[yaz-moved-to-github.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bf83b43..49ac4ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,30 @@
-## Copyright (C) 1994-2003, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.19 2003-02-12 15:06:42 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1994-2005, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.35 2006-05-08 12:20:48 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
-SUBDIRS = util odr comstack z39.50 ill zutil ccl cql server include lib client ztest zoom doc etc
+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 m4/yaz_libxml2.m4 buildconf.sh \
+       Doxyfile.in
 
 dist-hook:
-       cd doc; make
        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/*.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)