sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-15 16:59:09 +03:00
Code Activity

Fix installation of Samba 4 during merged build.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-10-30 23:19:51 +01:00
parent 9da4c3f830
commit c9f69f1436
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source3/samba4.mk
View File

@ -118,20 +118,21 @@ tallocsrcdir := $(samba4srcdir)/../lib/talloc
comsrcdir := $(samba4srcdir)/lib/com comsrcdir := $(samba4srcdir)/lib/com
override ASN1C = bin/asn1_compile4 override ASN1C = bin/asn1_compile4
override ET_COMPILER = bin/compile_et4 override ET_COMPILER = bin/compile_et4
include $(samba4srcdir)/build/make/python.mk
include samba4-data.mk include samba4-data.mk
include $(samba4srcdir)/static_deps.mk include $(samba4srcdir)/static_deps.mk
include $(samba4srcdir)/build/make/python.mk
INSTALLPERMS = 0755 INSTALLPERMS = 0755
$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
$(DESTDIR)$(bindir)/%: bin/%4 installdirs $(DESTDIR)$(bindir)/%4: bin/%4 installdirs
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Installing $(@F) as $@ @echo Installing $(@F) as $@
@if test -f $@; then rm -f $@.old; mv $@ $@.old; fi @if test -f $@; then rm -f $@.old; mv $@ $@.old; fi
@cp $< $@ @cp $< $@
@chmod $(INSTALLPERMS) $@ @chmod $(INSTALLPERMS) $@
$(DESTDIR)$(sbindir)/%: bin/%4 installdirs $(DESTDIR)$(sbindir)/%4: bin/%4 installdirs
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Installing $(@F) as $@ @echo Installing $(@F) as $@
@if test -f $@; then rm -f $@.old; mv $@ $@.old; fi @if test -f $@; then rm -f $@.old; mv $@ $@.old; fi
@ -158,6 +159,8 @@ clean::
proto:: $(PROTO_HEADERS) proto:: $(PROTO_HEADERS)
modules:: $(PLUGINS) modules:: $(PLUGINS)
pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
torture:: bin/smbtorture4 torture:: bin/smbtorture4
everything:: $(patsubst %,%4,$(BINARIES)) everything:: $(patsubst %,%4,$(BINARIES))

2
source4/build/make/python.mk
View File

@ -46,7 +46,7 @@ swig:: pythonmods
.SUFFIXES: _wrap.c .i .py .SUFFIXES: _wrap.c .i .py
%_wrap.c %.py: %.i %_wrap.c %.py: %.i
[ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $< [ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -python -keyword $<
realdistclean:: realdistclean::
@echo "Removing SWIG output files" @echo "Removing SWIG output files"

2
source4/lib/registry/config.mk
View File

@ -109,6 +109,6 @@ PUBLIC_DEPENDENCIES = registry
swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
$(eval $(call python_py_module_template,samba/registry.py,lib/registry/registry.py)) $(eval $(call python_py_module_template,samba/registry.py,$(libregistrysrcdir)/registry.py))
$(swig_registry_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) $(swig_registry_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)

2
source4/scripting/python/config.mk
View File

@ -25,7 +25,7 @@ $(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL
_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py") _PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py")
$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile)))) $(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
$(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py)) $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))