[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1665-g5c56464

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  5c56464a6c2f29a039ba3152de83d34778ca0615 (commit)
       via  a95f2bf86a75729717542b401aa39bedd21be8d0 (commit)
       via  bd3f3e7c85f1a92638d69379782aa7bfcecd9e2f (commit)
      from  c3eeae2ea6a7562b43a436f20c110002ca4d1d2b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 5c56464a6c2f29a039ba3152de83d34778ca0615
Merge: a95f2bf86a75729717542b401aa39bedd21be8d0 c3eeae2ea6a7562b43a436f20c110002ca4d1d2b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed May 21 12:22:05 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython

commit a95f2bf86a75729717542b401aa39bedd21be8d0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed May 21 12:14:47 2008 +0200

    Fix installed symlinks (cp was trying to be smart).

commit bd3f3e7c85f1a92638d69379782aa7bfcecd9e2f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed May 21 12:02:02 2008 +0200

    Allow dots in .mk file section headers, fix docstring.

-----------------------------------------------------------------------

Summary of changes:
 source/build/make/python.mk         |    2 +-
 source/build/make/templates.mk      |    2 +-
 source/build/smb_build/config_mk.pm |    2 +-
 source/param/config.mk              |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/make/python.mk b/source/build/make/python.mk
index c243b88..7d957fb 100644
--- a/source/build/make/python.mk
+++ b/source/build/make/python.mk
@@ -29,7 +29,7 @@ $(call python_module_template,$(1))
 endef
 
 # Python C module
-# Arguments: Module path, object files
+# Arguments: File name, dependencies, link list
 define python_c_module_template
 
 $$(pythonbuilddir)/$(1): $(2) ; 
diff --git a/source/build/make/templates.mk b/source/build/make/templates.mk
index 48678c5..1c0af4d 100644
--- a/source/build/make/templates.mk
+++ b/source/build/make/templates.mk
@@ -92,7 +92,7 @@ PLUGINS += bin/modules/$(2)/$(3).$$(SHLIBEXT)
 uninstallplugins::
 	@-rm $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
 installplugins::
-	@ln -fs $(1) $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
+	@ln -fs $(basename $(1)) $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
 
 endef
 
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 88e24a5..d28adb2 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -197,7 +197,7 @@ sub run_config_mk($$$$)
 			$prev = "";
 		}
 
-		if ($line =~ /^\[([-a-zA-Z0-9_:]+)\][\t ]*$/) 
+		if ($line =~ /^\[([-a-zA-Z0-9_.:]+)\][\t ]*$/) 
 		{
 			$section = $1;
 			$infragment = 0;
diff --git a/source/param/config.mk b/source/param/config.mk
index a25dd32..cf92089 100644
--- a/source/param/config.mk
+++ b/source/param/config.mk
@@ -57,7 +57,7 @@ PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB NDR_SECURITY
 
 SECRETS_OBJ_FILES = $(paramsrcdir)/secrets.o
 
-[PYTHON::param]
+[PYTHON::samba.param]
 SWIG_FILE = param.i
 PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG
 


-- 
Samba Shared Repository