diff --git a/Makefile.am b/Makefile.am
index 588a62cd6bcf74784a8687b23ca880ec22a469e5..b114971aebb8122d25c49eb3fd7b0c73c7abfdd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,12 @@
-SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
+if GRAPE
+ SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT GRAPE
+else 
+ SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
+endif
 
-EXTRA_DIST = DEMO
+ACLOCAL_AMFLAGS  = -I ./m4
+
+EXTRA_DIST = DEMO m4/check-package.m4
 
 # This target only makes sense for maintainers!!
 cvs-clean: