summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-12-04 07:29:29 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-12-07 13:07:03 +1100
commita4725f5880a3cebca83f0e0091403a4b80100e38 (patch)
tree4b5a558d6324589ee8d64946296541321812535d
parent972ee4b97b4e5d691dfe209366b639932bf02d43 (diff)
downloadsamba-a4725f5880a3cebca83f0e0091403a4b80100e38.tar.gz
samba-a4725f5880a3cebca83f0e0091403a4b80100e38.tar.bz2
samba-a4725f5880a3cebca83f0e0091403a4b80100e38.zip
s4:build torturedir and -DTORTUREDIR is unused
(And made building RPMs much more difficult for JHT)
-rw-r--r--source4/Makefile3
-rw-r--r--source4/dynconfig/config.mk1
2 files changed, 0 insertions, 4 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 8e4895bc11..6a99ea3160 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -11,7 +11,6 @@ include mkconfig.mk
pidldir := $(srcdir)/../pidl
basedir = $(prefix)
-torturedir = ../lib/torture
swatdir = $(datadir)/swat
setupdir = $(datadir)/setup
ncalrpcdir = $(localstatedir)/ncalrpc
@@ -182,7 +181,6 @@ showlayout::
@echo ' setupdir: $(setupdir)'
@echo ' swatdir: $(swatdir)'
@echo ' mandir: $(mandir)'
- @echo ' torturedir: $(torturedir)'
@echo ' datadir: $(datadir)'
@echo ' winbindd_socket_dir: $(winbindd_socket_dir)'
@echo ' ntp_signd_socket_dir: $(ntp_signd_socket_dir)'
@@ -210,7 +208,6 @@ installdirs::
$(DESTDIR)$(basedir) \
$(DESTDIR)$(bindir) \
$(DESTDIR)$(sbindir) \
- $(DESTDIR)$(torturedir) \
$(DESTDIR)$(libdir) \
$(DESTDIR)$(modulesdir) \
$(DESTDIR)$(modulesdir)/ldb \
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index f79cdb8e75..d800004e5d 100644
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -17,7 +17,6 @@ $(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR
-DSWATDIR=\"$(swatdir)\" \
-DPRIVATE_DIR=\"$(privatedir)\" \
-DMODULESDIR=\"$(modulesdir)\" \
- -DTORTUREDIR=\"$(torturedir)\" \
-DSETUPDIR=\"$(setupdir)\" \
-DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(winbindd_privileged_socket_dir)\" \
-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" \