[SCM] Samba Shared Repository - branch master updated - e6d55522507ef06abbc282547a7f65fbc4243b90

[Jelmer Vernooij]

The branch, master has been updated
       via  e6d55522507ef06abbc282547a7f65fbc4243b90 (commit)
       via  d26cde4da67feb2ae079fa7bb4aa4fd588939953 (commit)
       via  07bdb454e2e24aa16064ee26c1c03cd2b0dc3950 (commit)
      from  50feca550eed7828198b7c0fc5f0e5ddc863313d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e6d55522507ef06abbc282547a7f65fbc4243b90
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 01:40:08 2008 +0100

    Fix prefixing swig library directory with prefix.

commit d26cde4da67feb2ae079fa7bb4aa4fd588939953
Merge: 07bdb454e2e24aa16064ee26c1c03cd2b0dc3950 50feca550eed7828198b7c0fc5f0e5ddc863313d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 01:03:49 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 07bdb454e2e24aa16064ee26c1c03cd2b0dc3950
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 00:59:39 2008 +0100

    Use relative paths for Python modules. Seems to workaround a strange bug in
    GNU make.

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

Summary of changes:
 lib/talloc/talloc.mk         |    4 ++--
 source4/build/make/python.mk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk
index f183cd5..7f0afed 100644
--- a/lib/talloc/talloc.mk
+++ b/lib/talloc/talloc.mk
@@ -22,8 +22,8 @@ install:: all
 	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
 	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
 	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
-	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)$(prefix)`swig -swiglib` || true
-	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)$(prefix)`swig -swiglib` || true
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
+	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
 
 doc:: talloc.3 talloc.3.html
 
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index 9b91090..e5a5b87 100644
--- a/source4/build/make/python.mk
+++ b/source4/build/make/python.mk
@@ -1,4 +1,4 @@
-pythonbuilddir = $(builddir)/bin/python
+pythonbuilddir = bin/python
 
 installpython::
 	mkdir -p $(DESTDIR)$(pythondir)


-- 
Samba Shared Repository