summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-31 08:19:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:11 -0500
commitd73156d2c49c7876e2c396c207a02f575ca43fbe (patch)
treefaf4c3627d2a8b2faefcd1dd0c493eb2ca0c0f36 /source4/build
parent7dae041b1ac03a57abf0a4efcb43db54137a4eb1 (diff)
downloadsamba-d73156d2c49c7876e2c396c207a02f575ca43fbe.tar.gz
samba-d73156d2c49c7876e2c396c207a02f575ca43fbe.tar.bz2
samba-d73156d2c49c7876e2c396c207a02f575ca43fbe.zip
r12638: fix the build on BSD systems
metze (This used to be commit cd3cc29fdc2c0b9ffd82253857a7968e3324ea9b)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/config_mk.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index b7c4ff572a..64fd5e6fc9 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -29,8 +29,8 @@ my $section_types = {
"MANPAGE" => "string",
- "PUBLIC_PROTO_HEADER" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PUBLIC_PROTO_HEADER" => "string",
+ "PRIVATE_PROTO_HEADER" => "string"
},
"MODULE" => {
"SUBSYSTEM" => "string",
@@ -44,7 +44,7 @@ my $section_types = {
"NOPROTO" => "bool",
"MANPAGE" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PRIVATE_PROTO_HEADER" => "string"
},
"BINARY" => {
"OBJ_FILES" => "list",
@@ -56,7 +56,7 @@ my $section_types = {
"MANPAGE" => "string",
"INSTALLDIR" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PRIVATE_PROTO_HEADER" => "string"
},
"LIBRARY" => {
"MAJOR_VERSION" => "string",
@@ -65,7 +65,7 @@ my $section_types = {
"OBJ_FILES" => "list",
- "DESCRIPTION" => "string",
+ "DESCRIPTION" => "string",
"REQUIRED_SUBSYSTEMS" => "list",
@@ -74,10 +74,10 @@ my $section_types = {
"MANPAGE" => "string",
- "PUBLIC_HEADERS" => "list",
+ "PUBLIC_HEADERS" => "list",
- "PUBLIC_PROTO_HEADER" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PUBLIC_PROTO_HEADER" => "string",
+ "PRIVATE_PROTO_HEADER" => "string"
}
};
@@ -174,7 +174,7 @@ sub run_config_mk($$$)
$input->{$name}{NAME} = $name;
$input->{$name}{TYPE} = $type;
- $input->{$name}{BASEDIR} = $srcdir."/".dirname($filename);
+ $input->{$name}{BASEDIR} = dirname($filename);
foreach my $key (values %{$result->{$section}}) {
$key->{VAL} = smb_build::input::strtrim($key->{VAL});