[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kde-common/admin
From:       David Faure <faure () kde ! org>
Date:       2005-04-25 13:20:39
Message-ID: 20050425132039.53280488 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Backport fix for UNSERMAKE=no (from HEAD 1.155, the one that works :)


  M +8 -7      cvs.sh   1.151.4.1


--- kde-common/admin/cvs.sh  #1.151:1.151.4.1
@@ -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,8 @@
     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*)
+    echo "*** $AUTOMAKE_STRING found."
+    UNSERMAKE=no
+    ;;
   "" )
     echo "*** AUTOMAKE NOT FOUND!."
@@ -136,5 +137,5 @@
 $AUTOMAKE || exit 1
 
-if test -z "$UNSERMAKE"; then
+if test "$UNSERMAKE" = no; then
   echo "*** Postprocessing Makefile templates"
   perl -w admin/am_edit || exit 1
@@ -188,5 +189,5 @@
 fi
 $AUTOMAKE --foreign
-if test -z "$UNSERMAKE"; then
+if test "$UNSERMAKE" = no; then
   echo "*** Postprocessing Makefile templates"
   perl -w admin/am_edit || exit 1
@@ -562,5 +563,5 @@
    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if \
(/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) \
{ s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print \
$_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile  
-   kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
+   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 
    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" \
PREPARETIPS="$PREPARETIPS" srcdir=. \


[prev in list] [next in list] [prev in thread] [next in thread]