svn commit: samba r17681 - in branches/SAMBA_4_0/source/lib/talloc: .

tridge at samba.org tridge at samba.org
Tue Aug 22 01:50:46 GMT 2006


Author: tridge
Date: 2006-08-22 01:50:44 +0000 (Tue, 22 Aug 2006)
New Revision: 17681

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17681

Log:

fixed standalone talloc build to support building in a separate
directory

Modified:
   branches/SAMBA_4_0/source/lib/talloc/Makefile.in
   branches/SAMBA_4_0/source/lib/talloc/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2006-08-22 01:45:39 UTC (rev 17680)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2006-08-22 01:50:44 UTC (rev 17681)
@@ -4,10 +4,13 @@
 includedir = @includedir@
 libdir = @libdir@
 mandir = @mandir@
+VPATH = @srcdir@
+srcdir = @srcdir@
+builddir = @builddir@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H=
+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I$(srcdir)
 EXTRA_TARGETS = @DOC_TARGET@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html
@@ -25,8 +28,8 @@
 	${INSTALLCMD} -d ${libdir}
 	${INSTALLCMD} -m 755 libtalloc.a $(libdir)
 	${INSTALLCMD} -d ${includedir}
-	${INSTALLCMD} -m 644 talloc.h $(includedir)
-	${INSTALLCMD} -m 644 talloc.pc $(libdir)/pkgconfig
+	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(includedir)
+	${INSTALLCMD} -m 644 $(srcdir)/talloc.pc $(libdir)/pkgconfig
 	${INSTALLCMD} -d ${mandir}/man3
 	test -z "$(XSLTPROC)" || ${INSTALLCMD} -m 644 talloc.3 $(mandir)/man3
 

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.in	2006-08-22 01:45:39 UTC (rev 17680)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.in	2006-08-22 01:50:44 UTC (rev 17681)
@@ -1,5 +1,6 @@
 AC_PREREQ(2.50)
 AC_INIT(talloc.h)
+AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
 AC_PROG_CC
 if test "x$GCC" = "xyes"; then



More information about the samba-cvs mailing list