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:
mkdir $(distdir)/win