summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-11-21 16:32:38 +1100
committerAndreas Schneider <asn@samba.org>2012-11-22 10:21:16 +0100
commit8a2ef49dea36b103a87cf2aa63417737dd754ce6 (patch)
tree97e5fd48481171e45542383215be1921fbcef3bc /packaging
parentef195a18aac1f2b1ebfd34741d2242f659896549 (diff)
downloadsamba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.tar.gz
samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.tar.bz2
samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.zip
build: Be consistent with the name of smbtorture binaries
This ensures that in both build systems, smbtorture3 is the source3 binary, and smbtoture is our main smbtorture binary, built with waf. Also included in this is the removal of bin/ndrdump4 as a special case. This removes the last cases of binaries with different names in each build system. Andrew Bartlett Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/RHEL-CTDB/configure.rpm2
-rw-r--r--packaging/RHEL-CTDB/samba.spec.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 4387da1072..d0ae8b5a45 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -66,7 +66,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
--without-dnsupdate \
--with-aio-support \
--disable-merged-build \
- --disable-smbtorture4 \
+ --disable-smbtorture \
--disable-external-libtalloc \
--disable-external-libtdb \
$*
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 16d2fa43cb..a57269ea05 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -184,7 +184,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--without-dnsupdate \
--with-aio-support \
--disable-merged-build \
- --disable-smbtorture4 \
+ --disable-smbtorture \
--disable-external-libtalloc \
--disable-external-libtdb