From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 23:34:07 +0000 (-0600)
Subject: r26602: Revert my previous commit as it only works with GNU make.
X-Git-Tag: samba-4.0.0alpha3~631
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=ecd2d96c3173e4d2f77a1ca50f26a16ac7a313b1

r26602: Revert my previous commit as it only works with GNU make.
---

diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 61e436942d5..7ad6600a8c4 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -215,7 +215,6 @@ sub run_config_mk($$$$)
 	# corresponding input files. The curlies are so you can match the
 	# BEGIN/END pairs in a text editor.
 	$makefile .= "# BEGIN{ $parsing_file\n";
-	$makefile .= "dir = $basedir\n";
 
 	foreach (@lines) {
 		$linenum++;
diff --git a/source/lib/policy/config.mk b/source/lib/policy/config.mk
index da9c8daba46..f404d583773 100644
--- a/source/lib/policy/config.mk
+++ b/source/lib/policy/config.mk
@@ -3,9 +3,9 @@ CFLAGS = -Iheimdal/lib/roken
 OBJ_FILES = lex.o parse_adm.o 
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET 
 
-$(dir)/lex.l: $(dir)/parse_adm.h
+lib/policy/lex.l: lib/policy/parse_adm.h
 
-$(dir)/parse_adm.h: $(dir)/parse_adm.c
+lib/policy/parse_adm.h: lib/policy/parse_adm.c
 
 [BINARY::dumpadm]
 OBJ_FILES = dumpadm.o
diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 71c973f68d4..f1f50479cbc 100644
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -3,16 +3,16 @@ PUBLIC_DEPENDENCIES = TDR
 OBJ_FILES = tdr_regf.o
 
 # Special support for external builddirs
-$(dir)/regf.c: $(dir)/tdr_regf.c
-$(srcdir)/$(dir)/regf.c: $(dir)/tdr_regf.c
-$(dir)/tdr_regf.h: $(dir)/tdr_regf.c
-$(dir)/tdr_regf.c: $(srcdir)/$(dir)/regf.idl
+lib/registry/regf.c: lib/registry/tdr_regf.c
+$(srcdir)/lib/registry/regf.c: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.h: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
 	@CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
-		--header --outputdir=$(dir) \
-		--tdr-parser -- $(srcdir)/$(dir)/regf.idl
+		--header --outputdir=lib/registry \
+		--tdr-parser -- $(srcdir)/lib/registry/regf.idl
 
 clean::
-	@-rm -f $(dir)/regf.h $(dir)/tdr_regf*
+	@-rm -f lib/registry/regf.h lib/registry/tdr_regf*
 
 ################################################
 # Start SUBSYSTEM registry
diff --git a/source/scripting/python/config.mk b/source/scripting/python/config.mk
index ecf8f9a1020..4a531f5062d 100644
--- a/source/scripting/python/config.mk
+++ b/source/scripting/python/config.mk
@@ -33,7 +33,7 @@ pythonmods: $(PYTHON_DSOS)
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py
 
 pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package $(dir)/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
 clean::
 	@echo "Removing python modules"