diff --git a/MAINTENANCE b/MAINTENANCE
index 51f450bb579cdb11846f7c8c68cc6d1a08929cdb..d8a36d287d2e6a26918535fbbf49e74be6eb0e6f 100644
--- a/MAINTENANCE
+++ b/MAINTENANCE
@@ -67,3 +67,7 @@ b) All "Makefile.am"s and "Makefile.in"s are included. Ideally, the user simply
enters "configure" followed by "gmake", "gmake install" to install everything.
c) "configure" AND "configure.in" are included, so that possible installation problems can (hopefully) be corrected without too much trouble.
+
+V) Platform-dependent problems so far
+
+1)
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 906e3b957fe3adf9724021068d891f2e3eb71070..be64260af2d3e82dd916de8d52213e89a29bff06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,23 @@ SUBDIRS = BLAS IAMTOOLS SOLVER PLOT_ANSI ALBERT
EXTRA_DIST = DEMO
+cvs_list=DEMO/CVS DEMO/src/CVS DEMO/src/*/CVS DEMO/src/*/INIT/CVS DEMO/src/*/Macro/CVS ALBERT/src/Common/CVS
+
+cvs-clean:
+ @echo Fixing package for cvs commit...
+ find . -name \*~ -exec rm -rf {} \;
+ find ./ALBERT ./BLAS ./IAMTOOLS ./PLOT_ANSI ./SOLVER -name Makefile.in -exec rm -rf {} \;
+ find ./DEMO ./ALBERT ./BLAS ./IAMTOOLS ./PLOT_ANSI ./SOLVER -name Makefile -exec rm -rf {} \;
+ cp -f configure.in admin/
+ cp -f Makefile.am admin/
+ cp -f AUTHORS admin/
+ cp -f COPYING admin/
+ cp -f ChangeLog admin/
+ cp -f MAINTENANCE admin/
+ cp -f NEWS admin/
+ cp -f README admin/
+ chgrp -R albert *
+
dist-hook:
- @echo "Deleting CVS directories in built package..."
- (cd $(dist_dir) && find . -name CVS -exec 'cd {}/.. && rm -rf CVS' \; )
\ No newline at end of file
+ @echo Deleting CVS directories in built package...
+ (cd $(distdir) && rm -rf $(cvs_list) )
\ No newline at end of file
diff --git a/configure.in b/configure.in
index 1c5156f449417c85b1d5103b62261eec93a3bf88..ad07d27806e893eaa31159d87a7474190919086e 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,11 @@ AC_PROG_LN_S
AC_PROG_CC
AC_PROG_F77
-dnl support for Libtool
+dnl ******************************************************************************
+dnl comment the next line out to create dynamic libraries
+dnl ******************************************************************************
+
+AC_DISABLE_SHARED
AC_PROG_LIBTOOL
dnl change the installation directory. This could surely be done more elegantly...
@@ -35,12 +39,6 @@ AC_TYPE_SIZE_T
dnl Checks for library functions.
AC_CHECK_FUNCS(strdup strstr,,AC_MSG_ERROR(Exiting...))
-dnl ******************************************************************************
-dnl uncomment this to create dynamic libraries
-dnl ******************************************************************************
-
-static_libraries=-static
-
dnl ******************************************************************************
dnl Prevent -g from being set here automatically...
dnl ******************************************************************************
@@ -129,4 +127,4 @@ AC_SUBST(albert_variable_object)
AC_SUBST(make_own_blas_lib)
-AC_OUTPUT(Makefile BLAS/Makefile IAMTOOLS/Makefile SOLVER/Makefile SOLVER/src/Makefile PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile ALBERT/Makefile ALBERT/src/Makefile ALBERT/src/1d/Makefile ALBERT/src/2d/Makefile ALBERT/src/3d/Makefile ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert DEMO/src/1d/Makefile DEMO/src/2d/Makefile DEMO/src/3d/Makefile)
+AC_OUTPUT(Makefile BLAS/Makefile IAMTOOLS/Makefile SOLVER/Makefile SOLVER/src/Makefile PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile ALBERT/Makefile ALBERT/src/Makefile ALBERT/src/1d/Makefile ALBERT/src/2d/Makefile ALBERT/src/3d/Makefile ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert DEMO/src/Makefile DEMO/src/1d/Makefile DEMO/src/2d/Makefile DEMO/src/3d/Makefile)