diff options
| -rw-r--r-- | source4/build/make/python.mk | 2 | ||||
| -rw-r--r-- | source4/build/make/templates.mk | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
| -rw-r--r-- | source4/param/config.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk index c243b88e27..7d957fb108 100644 --- a/source4/build/make/python.mk +++ b/source4/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/source4/build/make/templates.mk b/source4/build/make/templates.mk index 48678c5603..1c0af4dee6 100644 --- a/source4/build/make/templates.mk +++ b/source4/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/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 88e24a5876..d28adb2e72 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/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/source4/param/config.mk b/source4/param/config.mk index a25dd32194..cf92089d5c 100644 --- a/source4/param/config.mk +++ b/source4/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 |