aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-10-18 13:05:37 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2009-10-18 13:05:37 +0100
commitb8cd2f28f1e993b4c6e8dbdcb05f36b449ac35a7 (patch)
tree83d74ed86868f7ab487585f504aa8d0e14e1286c
parent2fa30fd17d94700c1cd57500b0fafd6c5625f090 (diff)
downloadpaludis-b8cd2f28f1e993b4c6e8dbdcb05f36b449ac35a7.tar.gz
paludis-b8cd2f28f1e993b4c6e8dbdcb05f36b449ac35a7.tar.xz
Remove install wrapper
It's slow, and install -s calls strip anyway, so it's still caught.
-rw-r--r--paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am15
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/exheres-0/install-wrapper43
2 files changed, 2 insertions, 56 deletions
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
index 5a7c434..0909f2d 100644
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -30,16 +30,6 @@ libexecprog_SCRIPTS = \
strip \
banned_in_eapi_exheres-0
-all-local :
- ln -sf $(srcdir)/install-wrapper install
-
-install-data-local :
- install -d $(DESTDIR)/$(libexecprogdir)
- install $(srcdir)/install-wrapper $(DESTDIR)/$(libexecprogdir)/install
-
-uninstall-local :
- rm -f $(DESTDIR)/$(libexecprogdir)/install
-
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
TESTS_ENVIRONMENT = env \
@@ -59,14 +49,13 @@ TESTS =
EXTRA_DIST = \
$(check_SCRIPTS) \
$(libexecprog_SCRIPTS) \
- $(TESTS) \
- install-wrapper
+ $(TESTS)
bannedscripts = prepall prepallstrip prepstrip prepallman prepman prepallinfo \
prepinfo prepdocs prepalldocs dohard donewins dosed dohtml \
ecompress ecompressdir
-CLEANFILES = *~ $(bannedscripts) *.epicfail install
+CLEANFILES = *~ $(bannedscripts) *.epicfail
$(bannedscripts) : banned_in_eapi_exheres-0
cat $? > $@
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/install-wrapper b/paludis/repositories/e/ebuild/utils/exheres-0/install-wrapper
deleted file mode 100755
index 0500360..0000000
--- a/paludis/repositories/e/ebuild/utils/exheres-0/install-wrapper
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2009 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License as published by the Free Software Foundation; either version
-# 2 of the License, or (at your option) any later version.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-source "${PALUDIS_EBUILD_DIR}"/die_functions.bash
-
-for a in "$@" ; do
- case $a in
- -s|--strip)
- paludis_die_or_error "caught a naughty build system doing 'install $a'"
- exit 1
- ;;
-
- --)
- break
- ;;
- esac
-done
-
-new_path=
-IFS=':'
-for p in ${PATH} ; do
- [[ "$(canonicalise $(dirname ${0} ) )" == "$(canonicalise ${p} )" ]] && continue
- new_path="${new_path:+${new_path}:}${p}"
-done
-
-export PATH="${new_path}"
-exec install "$@"