sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Fix out of tree build. Remove the embedded srcdir path from talloc and tdb.

Browse Source
This commit is contained in:
Gerald W. Carter 2008-04-16 15:48:00 +02:00
parent 01bc4b6ac0
commit 359921acd4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Makefile.in
View File

@ -151,7 +151,7 @@ LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@ LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms
LIBTDB_HEADERS=@tdbdir@/include/tdb.h LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
@ -2131,7 +2131,7 @@ installlibtalloc: installdirs libtalloc
-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR) -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) @tallocdir@/talloc.h $(DESTDIR)${prefix}/include -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/@tallocdir@/talloc.h $(DESTDIR)${prefix}/include
installlibtdb: installdirs libtdb installlibtdb: installdirs libtdb
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)

4
source/configure.in
View File

@ -33,9 +33,9 @@ AC_SUBST(TALLOC_OBJS)
# TODO: These should come from m4_include(lib/tdb/libtdb.m4) # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
# but currently this fails: things have to get merged from s4. # but currently this fails: things have to get merged from s4.
tdbdir="${srcdir-.}/lib/tdb" tdbdir="lib/tdb"
AC_SUBST(tdbdir) AC_SUBST(tdbdir)
TDB_CFLAGS="-I$tdbdir/include" TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
AC_SUBST(TDB_CFLAGS) AC_SUBST(TDB_CFLAGS)
TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o" TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o"

8
source/lib/talloc/libtalloc.m4
View File

@ -1,10 +1,10 @@
dnl find the talloc sources. This is meant to work both for dnl find the talloc sources. This is meant to work both for
dnl talloc standalone builds, and builds of packages using talloc dnl talloc standalone builds, and builds of packages using talloc
tallocdir="" tallocdir=""
tallocpaths="$srcdir $srcdir/lib/talloc $srcdir/talloc $srcdir/../talloc" tallocpaths=". lib/talloc talloc ../talloc"
for d in $tallocpaths; do for d in $tallocpaths; do
if test -f "$d/talloc.c"; then if test -f "$srcdir/$d/talloc.c"; then
tallocdir="$d" tallocdir="$d"
AC_SUBST(tallocdir) AC_SUBST(tallocdir)
break; break;
fi fi
@ -15,7 +15,7 @@ fi
TALLOC_OBJ="talloc.o" TALLOC_OBJ="talloc.o"
AC_SUBST(TALLOC_OBJ) AC_SUBST(TALLOC_OBJ)
TALLOC_CFLAGS="-I$tallocdir" TALLOC_CFLAGS="-I$srcdir/$tallocdir"
AC_SUBST(TALLOC_CFLAGS) AC_SUBST(TALLOC_CFLAGS)
TALLOC_LIBS="" TALLOC_LIBS=""