s4:build torturedir and -DTORTUREDIR is unused

(And made building RPMs much more difficult for JHT)

diff --git a/source4/Makefile b/source4/Makefile
index 8e4895bc1118d668f33aeddb1702d9bf1c4e926e..6a99ea3160c8d8f76a7feb3086567be340754064 100644 (file)
--- 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 f79cdb8e750792b92c1880f9363856949a97c828..d800004e5d247036f0e554177b1dc0148f8bd90a 100644 (file)
--- 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)\" \