svn commit: samba r12638 - in branches/SAMBA_4_0/source: build/smb_build lib/registry

[metze at samba.org]

Author: metze
Date: 2005-12-31 08:19:48 +0000 (Sat, 31 Dec 2005)
New Revision: 12638

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12638

Log:
fix the build on BSD systems

metze
Modified:
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/lib/registry/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2005-12-31 05:34:29 UTC (rev 12637)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2005-12-31 08:19:48 UTC (rev 12638)
@@ -29,8 +29,8 @@
 
 		"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 @@
 		"NOPROTO"		=> "bool",
 
 		"MANPAGE"		=> "string",
-		"PRIVATE_PROTO_HEADER" => "string"
+		"PRIVATE_PROTO_HEADER"	=> "string"
 		},
 	"BINARY" => {
 		"OBJ_FILES"		=> "list",
@@ -56,7 +56,7 @@
 
 		"MANPAGE"		=> "string",
 		"INSTALLDIR"		=> "string",
-		"PRIVATE_PROTO_HEADER" => "string"
+		"PRIVATE_PROTO_HEADER"	=> "string"
 		},
 	"LIBRARY" => {
 		"MAJOR_VERSION"		=> "string",
@@ -65,7 +65,7 @@
 
 		"OBJ_FILES"		=> "list",
 
-		"DESCRIPTION" => "string",
+		"DESCRIPTION"		=> "string",
 
 		"REQUIRED_SUBSYSTEMS"	=> "list",
 
@@ -74,10 +74,10 @@
 
 		"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 @@
 
 		$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});

Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/config.mk	2005-12-31 05:34:29 UTC (rev 12637)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk	2005-12-31 08:19:48 UTC (rev 12638)
@@ -16,9 +16,11 @@
 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