From d73156d2c49c7876e2c396c207a02f575ca43fbe Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 31 Dec 2005 08:19:48 +0000
Subject: r12638: fix the build on BSD systems

metze
(This used to be commit cd3cc29fdc2c0b9ffd82253857a7968e3324ea9b)
---
 source4/build/smb_build/config_mk.pm | 18 +++++++++---------
 source4/lib/registry/config.mk       |  8 +++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'source4')

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});
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 988bbdbb12..fbef97a299 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -16,9 +16,11 @@ REQUIRED_SUBSYSTEMS = TDR
 NOPROTO = YES
 OBJ_FILES = tdr_regf.o
 
-$(srcdir)/lib/registry/reg_backend_nt4.c: $(builddir)/lib/registry/tdr_regf.c
-$(builddir)/lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
-	@CPP="$(CPP)" $(PERL) pidl/pidl $(PIDL_ARGS) --header --outputdir=$(builddir)/lib/registry --tdr-parser -- $(srcdir)/lib/registry/regf.idl
+lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.c: lib/registry/regf.idl
+	@CPP="$(CPP)" $(PERL) pidl/pidl $(PIDL_ARGS) \
+		--header --outputdir=lib/registry \
+		--tdr-parser -- lib/registry/regf.idl
 
 ################################################
 # Start MODULE registry_w95
-- 
cgit