summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-26 16:06:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:28:35 -0500
commit25579c6fe8a37b2726ab384bcb9b7e7a46f5e3ff (patch)
tree59d1da1a6a02d9dca4cf9e74c91a1a052bfab92e
parent096aa31e945c9e856ea58a52888a3d51d725105d (diff)
downloadsamba-25579c6fe8a37b2726ab384bcb9b7e7a46f5e3ff.tar.gz
samba-25579c6fe8a37b2726ab384bcb9b7e7a46f5e3ff.tar.bz2
samba-25579c6fe8a37b2726ab384bcb9b7e7a46f5e3ff.zip
r19908: Fix order of paths in pc files.
(This used to be commit 033b4382c09b7a4032388231f6e1f1986a663f9d)
-rw-r--r--source4/build/smb_build/env.pm4
-rw-r--r--source4/build/smb_build/makefile.pm20
2 files changed, 12 insertions, 12 deletions
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm
index eb798f5ad0..f468f51de1 100644
--- a/source4/build/smb_build/env.pm
+++ b/source4/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/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b86dbb591d..b639612fed 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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}"
+ ]
);
}