From 333c169529a3f64a28fcaff1056069867fd56a90 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 20:30:46 +0200
Subject: Use variables for source directory in remaining subsystems. (This
 used to be commit 6b6b2196a8a8d9e741f5c399185ded7a16938da0)

---
 source4/lib/util/config.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/lib/util')

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 5a4b831ed5..2c8d7e5f4d 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -4,7 +4,7 @@ PUBLIC_DEPENDENCIES = \
 		SOCKET_WRAPPER LIBREPLACE_NETWORK \
 		CHARSET EXECINFO
 
-LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
+LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
 	xfile.o \
 		debug.o \
 		fault.o \
@@ -25,7 +25,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
 		become_daemon.o \
 		params.o)
 
-PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
+PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
 				 attr.h \
 				 byteorder.h \
 				 data_blob.h \
@@ -39,12 +39,12 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
 [SUBSYSTEM::ASN1_UTIL]
 PRIVATE_PROTO_HEADER = asn1_proto.h
 
-ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
+ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h
 
-UNIX_PRIVS_OBJ_FILES = lib/util/unix_privs.o
+UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o
 
 ################################################
 # Start SUBSYSTEM WRAP_XATTR
@@ -54,15 +54,15 @@ PUBLIC_DEPENDENCIES = XATTR
 # End SUBSYSTEM WRAP_XATTR
 ################################################
 
-WRAP_XATTR_OBJ_FILES = lib/util/wrap_xattr.o
+WRAP_XATTR_OBJ_FILES = $(libutilsrcdir)/wrap_xattr.o
 
 [SUBSYSTEM::UTIL_TDB]
 PRIVATE_PROTO_HEADER = util_tdb.h
 PUBLIC_DEPENDENCIES = LIBTDB
 
-UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o
+UTIL_TDB_OBJ_FILES = $(libutilsrcdir)/util_tdb.o
 
 [SUBSYSTEM::UTIL_LDB]
 PUBLIC_DEPENDENCIES = LIBLDB
 
-UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o
+UTIL_LDB_OBJ_FILES = $(libutilsrcdir)/util_ldb.o
-- 
cgit