[SCM] Samba Shared Repository - branch master updated - 98a6b91da57ba71a0fe971cb24b1647d5f0062e8

Jelmer Vernooij jelmer at samba.org
Tue Oct 14 23:12:29 GMT 2008


The branch, master has been updated
       via  98a6b91da57ba71a0fe971cb24b1647d5f0062e8 (commit)
       via  95a86edd97943aec086ed119975bad940c0cfe47 (commit)
      from  aed571d1687f5342cc9a0958e3b54f8016a2c526 (commit)

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


- Log -----------------------------------------------------------------
commit 98a6b91da57ba71a0fe971cb24b1647d5f0062e8
Merge: 95a86edd97943aec086ed119975bad940c0cfe47 aed571d1687f5342cc9a0958e3b54f8016a2c526
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 15 01:11:56 2008 +0200

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

commit 95a86edd97943aec086ed119975bad940c0cfe47
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 15 01:11:18 2008 +0200

    Fix installation of libndr.h

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

Summary of changes:
 source4/headermap.txt    |    2 +-
 source4/librpc/config.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/headermap.txt b/source4/headermap.txt
index a1b21d7..43119d2 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -12,7 +12,7 @@ librpc/rpc/dcerpc.h: dcerpc.h
 lib/ldb/include/ldb.h: ldb.h
 lib/ldb/include/ldb_errors.h: ldb_errors.h
 auth/gensec/gensec.h: gensec.h
-librpc/ndr/libndr.h: ndr.h
+../librpc/ndr/libndr.h: ndr.h
 lib/registry/registry.h: registry.h
 libcli/util/werror.h: core/werror.h
 libcli/util/doserr.h: core/doserr.h
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index f3e9d46..02eb0ac 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -19,7 +19,7 @@ LIBNDR_SOVERSION = 0
 # End SUBSYSTEM LIBNDR
 ################################################
 
-PUBLIC_HEADERS += $(ndrsrcdir)/libndr.h
+PUBLIC_HEADERS += ../librpc/ndr/libndr.h
 
 #################################
 # Start BINARY ndrdump


-- 
Samba Shared Repository


More information about the samba-cvs mailing list