summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-15 16:25:37 +0200
committerStefan Metzmacher <metze@samba.org>2010-04-15 18:37:39 +0200
commitd8c3541ca8b012cb686a1517886132da574e8c55 (patch)
tree1d11052bf7fdc34aa5b27c9f7bdc79dbc0f9b1c4 /source4/script
parent7233699ad849b0771c946eb47b31ff50f64cefbf (diff)
downloadsamba-d8c3541ca8b012cb686a1517886132da574e8c55.tar.gz
Revert "s4:"dns_update_list" file: install it properly into the private directory"
This reverts commit fde707aa0c563d239c2f8c442cddfee0b6ff057f. This is wrong, we need to install it into the setup directory, so that provision will find it and copy it to private dir. metze
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/installmisc.sh15
1 files changed, 6 insertions, 9 deletions
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 32a2ee4ec6..d1648dd000 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -1,19 +1,18 @@
#!/bin/sh
# install miscellaneous files
-[ $# -eq 8 ] || {
- echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR PRIVATEDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
+[ $# -eq 7 ] || {
+ echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
exit 1
}
DESTDIR="$1"
SRCDIR="$2"
SETUPDIR="$3"
-PRIVATEDIR="$4"
-BINDIR="$5"
-SBINDIR="$6"
-PYTHONDIR="$7"
-PYTHON="$8"
+BINDIR="$4"
+SBINDIR="$5"
+PYTHONDIR="$6"
+PYTHON="$7"
cd $SRCDIR || exit 1
@@ -93,7 +92,5 @@ do
cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/samba/external/$package/ || exit 1
done
-echo "Installing stuff in $PRIVATEDIR"
-cp setup/dns_update_list $PRIVATEDIR || exit 1
exit 0