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

List:       kde-core-devel
Subject:    Re: kdeextragear-3
From:       Klas =?utf-8?q?Kala=C3=9F?= <klas.kalass () gmx ! de>
Date:       2004-03-08 16:14:53
Message-ID: 200403081714.53056.klas.kalass () gmx ! de
[Download RAW message or body]

Am Freitag 05 März 2004 11:31 schrieb Stephan Kulow:
> On Friday 05 March 2004 10:54, Klas Kalaß wrote:
> > So what is the correct solution?
>
> Fixing cvs.sh to support asteriks while creating Makefile.am

Not quite.

As you can see from the output I posted previously, creation of acinclude.m4 
fails. That has nothing to do with Makefile.am, but is simply running 
Makefile.am.in.wo. Thus the Makefile.am.in needs to use the wildcard function 
from make.

The attached patch to admin/cvs.sh takes this into consideration. 
Is it portable and may I commit it?

["cvs.sh-acinclude.diff" (text/x-diff)]

Index: admin/cvs.sh
===================================================================
RCS file: /home/kde/kde-common/admin/cvs.sh,v
retrieving revision 1.123
diff -u -3 -p -r1.123 cvs.sh
--- admin/cvs.sh	10 Feb 2004 14:40:11 -0000	1.123
+++ admin/cvs.sh	8 Mar 2004 16:14:05 -0000
@@ -491,6 +491,10 @@ acinclude_m4()
   else
     rm -f acinclude.m4
   fi
+  if echo $adds | grep -e "^\$(wildcard.*)" >/dev/null ; then
+    addfiles=`echo $adds | sed -e "s#^\\\$(wildcard\(.*\))#\1#g"`
+    adds=`ls -d -1 $addfiles 2>/dev/null`
+  fi
   # if it wasn't created up to now, then we do it better
   if test ! -f acinclude.m4; then
      cat admin/acinclude.m4.in admin/libtool.m4.in $adds > acinclude.m4


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