Author: jelmer
Date: 2006-11-26 16:06:11 +0000 (Sun, 26 Nov 2006)
New Revision: 19908

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19908

Log:
Fix order of paths in pc files.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/env.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/env.pm    2006-11-26 06:04:35 UTC 
(rev 19907)
+++ branches/SAMBA_4_0/source/build/smb_build/env.pm    2006-11-26 16:06:11 UTC 
(rev 19908)
@@ -66,8 +66,8 @@
        mkpath(dirname($path),0,0755);
        open(OUT, ">$path") or die("Can't open $path: $!");
 
-       foreach (keys %$dirs) {
-               print OUT "$_=" . $dirs->{$_} . "\n";
+       foreach (@$dirs) {
+               print OUT "$_\n";
        }
        if ($hasmodules) {
                print OUT "modulesdir=$self->{config}->{modulesdir}/$name\n" ;

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-11-26 
06:04:35 UTC (rev 19907)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-11-26 
16:06:11 UTC (rev 19908)
@@ -458,12 +458,12 @@
                defined($ctx->{INIT_FUNCTIONS}),
                $pubs,
                $privs,
-               {
-                       "prefix" => $self->{config}->{prefix},
-                       "exec_prefix" => $self->{config}->{exec_prefix},
-                       "libdir" => $self->{config}->{libdir},
-                       "includedir" => $self->{config}->{includedir}
-               }
+               [
+                       "prefix=$self->{config}->{prefix}",
+                       "exec_prefix=$self->{config}->{exec_prefix}",
+                       "libdir=$self->{config}->{libdir}",
+                       "includedir=$self->{config}->{includedir}"
+               ]
        ); 
        smb_build::env::PkgConfig($self,
                "bin/pkgconfig/$link_name-uninstalled.pc",
@@ -476,10 +476,10 @@
                defined($ctx->{INIT_FUNCTIONS}),
                $pubs,
                $privs,
-               {
-                       "prefix" => "bin/",
-                       "includedir" => "$ctx->{BASEDIR}"
-               }
+               [
+                       "prefix=bin/",
+                       "includedir=$ctx->{BASEDIR}"
+               ]
        ); 
 }
 

Reply via email to