From 033b4382c09b7a4032388231f6e1f1986a663f9d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 26 Nov 2006 16:06:11 +0000
Subject: [PATCH] r19908: Fix order of paths in pc files.

---
 source/build/smb_build/env.pm      |  4 ++--
 source/build/smb_build/makefile.pm | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/build/smb_build/env.pm b/source/build/smb_build/env.pm
index eb798f5ad03..f468f51de1e 100644
--- 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 b86dbb591d7..b639612fed5 100644
--- 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}"
+		]
 	); 
 }
 
-- 
2.34.1