[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  0dfe1b9... s3: fix the merged build - it required $LD
      from  fc33659... Remove the copy of ldb from Samba 3.

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


- Log -----------------------------------------------------------------
commit 0dfe1b9b13d9caec4ebda37a792e7eaa0b9c7200
Author: Björn Jacke <bj at sernet.de>
Date:   Thu May 6 12:26:43 2010 +0200

    s3: fix the merged build - it required $LD
    
    Thanks to Jelmer for pointing that out!

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

Summary of changes:
 source3/samba4.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 1ad46f2..c235d60 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -1,6 +1,6 @@
 # samba 4 bits
 
-PROG_LD = $(LD)
+PROG_LD = ld
 BNLD = $(CC)
 HOSTLD = $(CC)
 PARTLINK = $(PROG_LD) -r


-- 
Samba Shared Repository