r19908: Fix order of paths in pc files.

diff --git a/source/build/smb_build/env.pm b/source/build/smb_build/env.pm
index eb798f5ad034d425c124e1126246a0da3ce55808..f468f51de1ed300ad3d8b28f8b04d3d3ec20e49d 100644 (file)
--- a/source/build/smb_build/env.pm
+++ b/source/build/smb_build/env.pm
@@ -66,8 +66,8 @@ sub PkgConfig($$$$$$$$$$$$)
        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" ;

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index b86dbb591d7ec77d6760ac5bcad37af79d150cde..b639612fed5de38488efd32a615bcc9efd080128 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -458,12 +458,12 @@ sub PkgConfig($$$)
                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 @@ sub PkgConfig($$$)
                defined($ctx->{INIT_FUNCTIONS}),
                $pubs,
                $privs,
-               {
-                       "prefix" => "bin/",
-                       "includedir" => "$ctx->{BASEDIR}"
-               }
+               [
+                       "prefix=bin/",
+                       "includedir=$ctx->{BASEDIR}"
+               ]
        ); 
 }