diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-17 15:36:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:35 -0500 |
| commit | 5790d73119e1089a9025b7df5c1c90100d004383 (patch) | |
| tree | cf93056b96b9660f52f878ff22622e1ffa94afde /source4/build | |
| parent | 48e22c1547ff7b2fefa81ac60b8854e74ff86ffc (diff) | |
| download | samba-5790d73119e1089a9025b7df5c1c90100d004383.tar.gz samba-5790d73119e1089a9025b7df5c1c90100d004383.tar.bz2 samba-5790d73119e1089a9025b7df5c1c90100d004383.zip | |
r14517: Put Modulesdir: line in .pc files, so 3rd parties know where to install
their modules.
(This used to be commit 2cb96e08f3c69f21ed14b12d79f441628a790ce6)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/env.pm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm index 09d8eb1536..c090fb83eb 100644 --- a/source4/build/smb_build/env.pm +++ b/source4/build/smb_build/env.pm @@ -54,9 +54,9 @@ sub _set_config($$) } } -sub PkgConfig($$$$$$$) +sub PkgConfig($$$$$$$$) { - my ($self,$path,$name,$libs,$cflags,$version,$desc) = @_; + my ($self,$path,$name,$libs,$cflags,$version,$desc,$hasmodules) = @_; print __FILE__.": creating $path\n"; @@ -67,9 +67,14 @@ prefix=$self->{config}->{prefix} exec_prefix=$self->{config}->{exec_prefix} libdir=$self->{config}->{libdir} includedir=$self->{config}->{includedir} - __EOF__ + if ($hasmodules) { + print OUT "modulesdir=$self->{config}->{modulesdir}\n" ; + } + + print OUT "\n"; + print OUT "Name: $name\n"; if (defined($desc)) { print OUT "Description: $desc\n"; @@ -77,6 +82,9 @@ __EOF__ print OUT "Version: $version\n"; print OUT "Libs: -L\${libdir} $libs\n"; print OUT "Cflags: -I\${includedir} $cflags\n"; + if ($hasmodules) { + print OUT "Modulesdir: \${modulesdir}\n"; + } close(OUT); } |