-SUBDIRS = intl m4 src data po
-EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs config.rpath config.rpath LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
-ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = lib src data
+EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
+ACLOCAL_AMFLAGS = -I mk/autoconf
+AUTOMAKE_OPTIONS = 1.6 dist-bzip2