CVS fixes

diff --git a/envy24control/cvscompile b/envy24control/cvscompile
index e54e9cd358b80db3c80b9ce4855f37173620c777..01e8151833bc9229d39f8e98315e0a96ed0cd13e 100644 (file)
--- a/envy24control/cvscompile
+++ b/envy24control/cvscompile
@@ -1,18 +1,20 @@
 #!/bin/bash
 
-share=/usr/share/automake/missing
+if test "x$AUTOMAKE_DIR" = "x"; then
+  if test -d /usr/local/share/automake; then
+    AUTOMAKE_DIR=/usr/local/share/automake
+  fi
+  if test -d /usr/share/automake; then
+    AUTOMAKE_DIR="/usr/share/automake"
+  fi
+fi
+
+for f in install-sh mkinstalldirs missing; do
+  cp -av $AUTOMAKE_DIR/$f .
+done
 
 aclocal $ACLOCAL_FLAGS
-automake --foreign
-if [ ! -r install-sh ]; then
-  cp $share/install-sh .
-fi
-if [ ! -r mkinstalldirs ]; then
-  cp $share/mkinstalldirs .
-fi
-if [ ! -r missing ]; then
-  cp $share/missing .
-fi
+automake --foreign --add-missing
 autoconf
 export CFLAGS='-O2 -Wall -pipe -g'
 echo "CFLAGS=$CFLAGS"