summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile7
-rwxr-xr-xsource4/script/installtorture.sh18
-rwxr-xr-xsource4/script/uninstalltorture.sh15
3 files changed, 1 insertions, 39 deletions
diff --git a/source4/Makefile b/source4/Makefile
index f96a07a113..66b092192e 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -210,11 +210,7 @@ installdirs::
$(DESTDIR)$(PKGCONFIGDIR) \
$(DESTDIR)$(sysconfdir)
-installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs
- @$(SHELL) $(srcdir)/script/installtorture.sh \
- $(INSTALLPERMS) \
- $(DESTDIR)$(TORTUREDIR) \
- $(TORTURE_PROGS)
+installbin:: installdirs
installplugins::
@@ -262,7 +258,6 @@ $(DESTDIR)$(sbindir)/%: bin/% installdirs
@chmod $(INSTALLPERMS) $@
uninstallbin::
- @$(SHELL) $(srcdir)/script/uninstalltorture.sh $(DESTDIR)$(TORTUREDIR) $(TORTURE_PROGS)
uninstalllib::
@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(SHARED_LIBS)
diff --git a/source4/script/installtorture.sh b/source4/script/installtorture.sh
deleted file mode 100755
index db7ad9110c..0000000000
--- a/source4/script/installtorture.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-INSTALLPERMS=$1
-TORTUREDIR=$2
-shift
-shift
-
-for p in $*; do
- p2=`dirname $p`
- base=`basename $p`
- DESTDIR=$TORTUREDIR/`basename $p2`
- mkdir -p $DESTDIR
- echo Installing $p as $DESTDIR/$base
- cp -f $p $DESTDIR/
- chmod $INSTALLPERMS $DESTDIR/$base
-done
-
-exit 0
diff --git a/source4/script/uninstalltorture.sh b/source4/script/uninstalltorture.sh
deleted file mode 100755
index 0c6e4ec991..0000000000
--- a/source4/script/uninstalltorture.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-TORTUREDIR=$1
-shift
-shift
-
-for p in $*; do
- p2=`dirname $p`
- base=`basename $p`
- DESTDIR=$TORTUREDIR/`basename $p2`
- echo Removing $DESTDIR/$base
- rm -f $p $DESTDIR/
-done
-
-exit 0