summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 16:15:21 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-16 16:15:21 +0100
commit7df18932f65282461ee00c1ae17712c490be84d4 (patch)
tree55917e2faed8b4be91e548fe7a7426be8b25debf
parent6060aa91c4d85b20d70594b271c0e1ee155dba2b (diff)
downloadsamba-7df18932f65282461ee00c1ae17712c490be84d4.tar.gz
samba-7df18932f65282461ee00c1ae17712c490be84d4.tar.bz2
samba-7df18932f65282461ee00c1ae17712c490be84d4.zip
use gmake to handle .py file copies.
(This used to be commit 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1)
-rw-r--r--source4/build/smb_build/makefile.pm4
-rw-r--r--source4/scripting/python/config.mk4
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a560b1a1cf..df0bf5f30b 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -360,9 +360,7 @@ sub PythonFiles($$)
foreach (@{$ctx->{PYTHON_FILES}}) {
my $target = "bin/python/".basename($_);
my $source = output::add_dir_str($ctx->{BASEDIR}, $_);
- $self->output("$target: $source\n" .
- "\tmkdir -p \$(builddir)/bin/python\n" .
- "\tcp $source \$@\n\n");
+ $self->output("$target: $source\n\n");
push (@{$self->{python_pys}}, $target);
}
}
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b15e1fcda7..16cd301aad 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -35,6 +35,10 @@ PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py
pydoctor:: pythonmods
LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+bin/python/%.py:
+ mkdir -p $(@D)
+ cp $< $@
+
installpython:: pythonmods
@$(SHELL) $(srcdir)/script/installpython.sh \
$(INSTALLPERMS) \