diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-02-26 16:18:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:48:55 -0500 |
| commit | fd2d095048ef30292688a647af7a3d58c3b175a1 (patch) | |
| tree | bd1103daf5277b940e23e86487fa93876c416e76 /source4/build | |
| parent | 8c62b4c95163e7e1fc5a8bd600090efdba13d6b5 (diff) | |
| download | samba-fd2d095048ef30292688a647af7a3d58c3b175a1.tar.gz samba-fd2d095048ef30292688a647af7a3d58c3b175a1.tar.bz2 samba-fd2d095048ef30292688a647af7a3d58c3b175a1.zip | |
r21541: Export mgmt, samr and atsvc for use in samba-gtk.
(This used to be commit 7f451cbb8da26cfe27861c402e06b3f34f7ac647)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 9f571396eb..f72101a763 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -71,8 +71,8 @@ sub _prepare_path_vars($) prefix = $self->{config}->{prefix} exec_prefix = $self->{config}->{exec_prefix} selftest_prefix = $self->{config}->{selftest_prefix} -VPATH = $self->{config}->{srcdir}:heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des srcdir = $self->{config}->{srcdir} +VPATH = \$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des builddir = $self->{config}->{builddir} datarootdir = $self->{config}->{datarootdir} @@ -85,10 +85,10 @@ MODULESDIR = $self->{config}->{modulesdir} INCLUDEDIR = $self->{config}->{includedir} CONFIGDIR = $self->{config}->{sysconfdir} DATADIR = $self->{config}->{datadir} -WEBAPPSDIR = $self->{config}->{datadir}/webapps -SERVICESDIR = $self->{config}->{datadir}/services -JSDIR = $self->{config}->{datadir}/js -SETUPDIR = $self->{config}->{datadir}/setup +WEBAPPSDIR = \$(DATADIR)/webapps +SERVICESDIR = \$(DATADIR)/services +JSDIR = \$(DATADIR)/js +SETUPDIR = \$(DATADIR)/setup VARDIR = $self->{config}->{localstatedir} LOGFILEBASE = $self->{config}->{logfilebase} NCALRPCDIR = $self->{config}->{localstatedir}/ncalrpc @@ -476,12 +476,17 @@ sub PkgConfig($$$) "includedir=$self->{config}->{includedir}" ] ); + my $abs_srcdir = abs_path($self->{config}->{srcdir}); smb_build::env::PkgConfig($self, "bin/pkgconfig/$link_name-uninstalled.pc", $link_name, "-Lbin/shared -Lbin/static -l$link_name", $privlibs, - "-I. -Iinclude -Ilib -Ilib/replace", + join(' ', + "-I$abs_srcdir", + "-I$abs_srcdir/include", + "-I$abs_srcdir/lib", + "-I$abs_srcdir/lib/replace"), "$ctx->{VERSION}", $ctx->{DESCRIPTION}, defined($ctx->{INIT_FUNCTIONS}), |