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

List:       kde-commits
Subject:    kdebindings/smoke/kde
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-07-31 22:58:54
Message-ID: 20040731225854.3462599F2 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

In some cases (src != build in particular), @kde_includes@ contains
${prefix} instead of the actual prefix. This is fine in Makefiles,
since prefix gets set there and everything expands out in the end.
In the generated perl script, ${prefix} doesn't work, so we need
to determine the prefix (configure.in.in change) and possibly substitute 
it into $kdeinc (generate.pl.in change). This makes smoke/ build properly
and unattended with src != build.


  M +2 -0      configure.in.in   1.5
  M +2 -0      generate.pl.in   1.17


--- kdebindings/smoke/kde/configure.in.in  #1.4:1.5
@@ -8,4 +8,6 @@
 AC_SUBST(KDE_HAVE_GL)   
 
+KDE_PREFIX=`$KDECONFIG --prefix`
+AC_SUBST(KDE_PREFIX)
 
 if test "X$kde_build_libsmoke" = "Xkde" -o "X$kde_build_libsmoke" = "Xqt kde"; then

--- kdebindings/smoke/kde/generate.pl.in  #1.16:1.17
@@ -162,5 +162,7 @@
 
 my @kdeheaders = ();
+$kdeprefix = "@KDE_PREFIX@";
 $kdeinc= '@kde_includes@';
+$kdeinc =~ s/\${prefix}/$kdeprefix/; # Remove ${prefix} in src != build
 -d $kdeinc or die "Couldn't process $kdeinc: $!\n";
 


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