summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2007-04-02 23:13:47 +0200
committerJaka Kranjc2007-04-08 08:32:31 +0200
commit447923d94b5c95ff820cf78fcc0f9361bdfe743b (patch)
tree33d6164295bd75c428a1ea9b4c5d8c8b839563f4
parent046668a0608dc8a2168a11517a26cadd998cf41c (diff)
tar: prevent $INSTALL_ROOT/$INSTALL_ROOT/bin/tar, bug 13593
(cherry picked from commit 50fb47b9b8495e5e675ef66d4ae11685733bab96)
-rwxr-xr-xarchive/tar/BUILD2
-rw-r--r--archive/tar/HISTORY4
-rwxr-xr-xarchive/tar/INSTALL2
3 files changed, 6 insertions, 2 deletions
diff --git a/archive/tar/BUILD b/archive/tar/BUILD
index 400f25d395..cef62cc036 100755
--- a/archive/tar/BUILD
+++ b/archive/tar/BUILD
@@ -9,5 +9,5 @@ OPTS="$OPTS --build=${BUILD}"
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info \
$OPTS &&
-make DESTDIR=$INSTALL_ROOT
+make
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index b65d7a8dff..0cc91af7fb 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,7 @@
+2007-04-02 Thomas Orgis <sobukus@sourcemage.org>
+ * BUILD, INSTALL: remove DESTDIR, since that doubled INSTALL_ROOT,
+ bug 13593
+
2007-01-20 Pol Vinogradov <vin.public@gmail.com>
* BUILD: install_rootifying
* CONFIGURE: removed
diff --git a/archive/tar/INSTALL b/archive/tar/INSTALL
index 10a1e28b72..8992ad1b53 100755
--- a/archive/tar/INSTALL
+++ b/archive/tar/INSTALL
@@ -1,2 +1,2 @@
-make install DESTDIR=$INSTALL_ROOT &&
+make install &&
cp $SCRIPT_DIRECTORY/tar.1.gz ${INSTALL_ROOT}/usr/share/man/man1