diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-08-22 01:50:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:23 -0500 |
| commit | d132f724bd0e8c8e84e1b61d4d5211131028bc42 (patch) | |
| tree | 89f74edfc4e31b8707581afa5eeb2fff58222006 /source4 | |
| parent | 9a883a6336e65c0f0df8507f88779fc2a895f880 (diff) | |
| download | samba-d132f724bd0e8c8e84e1b61d4d5211131028bc42.tar.gz samba-d132f724bd0e8c8e84e1b61d4d5211131028bc42.tar.bz2 samba-d132f724bd0e8c8e84e1b61d4d5211131028bc42.zip | |
r17681: fixed standalone talloc build to support building in a separate
directory
(This used to be commit c137a7049ed6a74c035ef7fad86ac1e77e31028c)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/talloc/Makefile.in | 9 | ||||
| -rw-r--r-- | source4/lib/talloc/configure.in | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in index c1477cea69..e5c4e5274a 100644 --- a/source4/lib/talloc/Makefile.in +++ b/source4/lib/talloc/Makefile.in @@ -4,10 +4,13 @@ exec_prefix = @exec_prefix@ 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 @@ install: all ${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 diff --git a/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in index fc52679737..253992cb1a 100644 --- a/source4/lib/talloc/configure.in +++ b/source4/lib/talloc/configure.in @@ -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 |