X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.am;h=904cf51cb9c885837aa25bcde5b30a8687dce816;hp=3e1b74f91415accc9c3bc13dc9afcd975d99710e;hb=e65dd6fdeb899a631867cc4f17aac2d04d3cecbb;hpb=f53079fadcadb1eeef45e1e6d254801d984d6068

diff --git a/Makefile.am b/Makefile.am
index 3e1b74f..904cf51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,34 @@
-## Copyright (C) 1994-2004, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.29 2004-10-03 22:34:07 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1995-2007, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.43 2007-03-16 08:06:26 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
-SUBDIRS = src include util test client ztest zoom doc etc
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = src include util test client ztest zoom ziffy doc etc
 
 aclocaldir=$(datadir)/aclocal
 
-aclocal_DATA = yaz.m4
+aclocal_DATA = m4/yaz.m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = yaz.pc
 
 SPEC_FILE=$(PACKAGE).spec
-EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO windows.txt \
-	yaz-config.in yaz.m4 buildconf.sh Doxyfile.in
+EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO ChangeLog \
+	yaz-config.in yaz.pc.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
+	Doxyfile.in m4/acx_pthread.m4
 
 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)