summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 15:53:38 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-25 15:53:38 +0100
commite001b6f1b05d4e93380d005da28227aece6e1c1c (patch)
treefdf995e0829c353a25c2f9d17b7c1c5253f0cd28
parent9bcc28cdeca145296a5924bf496453f2a0a01ebb (diff)
downloadsamba-e001b6f1b05d4e93380d005da28227aece6e1c1c.tar.gz
samba-e001b6f1b05d4e93380d005da28227aece6e1c1c.tar.bz2
samba-e001b6f1b05d4e93380d005da28227aece6e1c1c.zip
Use realpath for now to work around .. tricks.
(This used to be commit c43b0d43cde11991723eff53fefdc38ca036a67e)
-rw-r--r--source4/build/smb_build/makefile.pm14
-rw-r--r--source4/build/smb_build/output.pm2
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 5de8519044..b57015b65e 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -263,7 +263,7 @@ sub Header($$)
return if ($#{$ctx->{PUBLIC_HEADERS}} == -1);
- $self->output("PUBLIC_HEADERS += \$(addprefix $ctx->{BASEDIR}/, " . join(" ", @{$ctx->{PUBLIC_HEADERS}}) . ")\n");
+ $self->output("PUBLIC_HEADERS += \$(realpath \$(addprefix $ctx->{BASEDIR}/, " . join(" ", @{$ctx->{PUBLIC_HEADERS}}) . "))\n");
}
sub Binary($$)
@@ -311,7 +311,7 @@ sub PythonFiles($$)
foreach (@{$ctx->{PYTHON_FILES}}) {
my $target = "bin/python/".basename($_);
- $self->output("$target: \$(addprefix $ctx->{BASEDIR}/, $_)\n\n");
+ $self->output("$target: \$(realpath \$(addprefix $ctx->{BASEDIR}/, $_))\n\n");
$self->output("PYTHON_PYS += $target\n");
}
}
@@ -320,7 +320,7 @@ sub Manpage($$)
{
my ($self,$ctx) = @_;
- $self->output("MANPAGES += \$(addprefix $ctx->{BASEDIR}/, $ctx->{MANPAGE})\n");
+ $self->output("MANPAGES += \$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{MANPAGE}))\n");
}
sub ProtoHeader($$)
@@ -334,7 +334,7 @@ sub ProtoHeader($$)
my $pub = undef;
if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
- $priv = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
+ $priv = "\$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER}))";
$target .= $priv;
$comment .= $priv;
if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
@@ -344,17 +344,17 @@ sub ProtoHeader($$)
$self->output("PROTO_HEADERS += $priv\n");
} else {
$ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
- $priv = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
+ $priv = "\$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER}))";
}
if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
- $pub = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER})";
+ $pub = "\$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER}))";
$comment .= $pub;
$target .= $pub;
$self->output("PROTO_HEADERS += $pub\n");
} else {
$ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
- $pub = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER})";
+ $pub = "\$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER}))";
}
$self->output("$pub: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 4a977db731..9c2e2b8730 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -137,7 +137,7 @@ sub create_output($$)
# Combine object lists
if (defined($part->{OBJ_FILES})) {
- my $list = "\$(addprefix $part->{BASEDIR}/, " . join(" ", @{$part->{OBJ_FILES}}) . ")";
+ my $list = "\$(realpath \$(addprefix $part->{BASEDIR}/, " . join(" ", @{$part->{OBJ_FILES}}) . "))";
push(@{$part->{OBJ_LIST}}, $list);
}