summaryrefslogtreecommitdiff
path: root/source4/dynconfig.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-10-17 00:56:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:16 -0500
commitc554e2168bbc7c89bd02768a45ce9a8c7dd57b43 (patch)
treed0ace01672fed5ae792405ec93b48e6b198e8eff /source4/dynconfig.mk
parenta9f4e0dd8f38a89936c178a9c8c758691cf924d1 (diff)
downloadsamba-c554e2168bbc7c89bd02768a45ce9a8c7dd57b43.tar.gz
samba-c554e2168bbc7c89bd02768a45ce9a8c7dd57b43.tar.bz2
samba-c554e2168bbc7c89bd02768a45ce9a8c7dd57b43.zip
r19358: Use subunit tests from the right location (from
$src/bin/torture when developing, $LIBDIR/torture when installed) (This used to be commit 4ae6380e6bb48e27e9947e149b3d079b3e293cc0)
Diffstat (limited to 'source4/dynconfig.mk')
-rw-r--r--source4/dynconfig.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 180333693d..76479af0fa 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -28,9 +28,9 @@ DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \
-DSWATDIR=\"$(srcdir)/../swat\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DMODULESDIR=\"$(builddir)/bin/modules\" \
-DJSDIR=\"$(srcdir)/scripting/libjs\" \
- -DSETUPDIR=\"$(srcdir)/setup\" \
+ -DSETUPDIR=\"$(srcdir)/setup\" -DTORTUREDIR=\"$(srcdir)/bin/torture\" \
-DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
dynconfig-devel.o: dynconfig.c Makefile
@echo Compiling $<
- @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@
+ @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` -Ilib/replace $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@