X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=Makefile.am;h=031b5b343597d78368fab020a182eeb2f42b9c66;hp=de0e090355c764d54947418398d3f9575efee1d3;hb=c7c1089f9c601a586afa8948ffa70a588512fb15;hpb=e694945c798867f4eb004fa0c4b8aed1feaac352

diff --git a/Makefile.am b/Makefile.am
index de0e090..031b5b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,21 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = src include proxy zlint zoom etc doc 
+SUBDIRS = src include zlint zoom doc 
+
+ACLOCAL_AMFLAGS = -I m4
 
 aclocaldir=$(datadir)/aclocal
-aclocal_DATA = yazpp.m4
+aclocal_DATA = m4/yazpp.m4
 
-EXTRA_DIST= LICENSE LICENSE.proxy TODO yaz++-config.in yazpp.m4
+EXTRA_DIST= LICENSE TODO yazpp-config.in m4/yaz.m4 m4/yazpp.m4 buildconf.sh
 
 dist-hook:
+	if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; fi
 	mkdir $(distdir)/win
 	cp $(srcdir)/win/makefile $(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