From kde-commits  Mon Apr 25 10:10:12 2005
From: David Faure <faure () kde ! org>
Date: Mon, 25 Apr 2005 10:10:12 +0000
To: kde-commits
Subject: kde-common/admin
Message-Id: <20050425101012.972A7488 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111442382419425

CVS commit by faure: 

fix support for UNSERMAKE=no, especially in kde-i18n


  M +4 -4      cvs.sh   1.153


--- kde-common/admin/cvs.sh  #1.152:1.153
@@ -45,5 +45,5 @@
     ;;
 esac
- 
+
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
@@ -61,6 +61,4 @@
 esac
 
-unset UNSERMAKE || :
-
 AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
 required_automake_version="1.6.1 or newer"
@@ -71,5 +69,7 @@
     exit 1
     ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) : ;;
+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
+    UNSERMAKE=no
+    ;;
   "" )
     echo "*** AUTOMAKE NOT FOUND!."