diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-09-26 09:05:02 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-09-26 09:05:02 +0000 |
| commit | 48b4b1cd9af6465dc4600b01623d52b91d3e69f2 (patch) | |
| tree | f077f32049c8a044e82f6daa1605f2228ac671ed /net-misc | |
| parent | Use emake on install. Stop adding /usr/share/X11/xkb to CONFIG_PROTECT becaus... (diff) | |
| download | gentoo-2-48b4b1cd9af6465dc4600b01623d52b91d3e69f2.tar.gz gentoo-2-48b4b1cd9af6465dc4600b01623d52b91d3e69f2.tar.bz2 gentoo-2-48b4b1cd9af6465dc4600b01623d52b91d3e69f2.zip | |
improve get_make_options(); use $KERNEL_DIR
(Portage version: 2.1.2.12)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openswan/openswan-2.4.9-r1.ebuild | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/net-misc/openswan/openswan-2.4.9-r1.ebuild b/net-misc/openswan/openswan-2.4.9-r1.ebuild index c76bd6646c51..fbdb6b485ee8 100644 --- a/net-misc/openswan/openswan-2.4.9-r1.ebuild +++ b/net-misc/openswan/openswan-2.4.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v 1.1 2007/09/26 08:14:22 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v 1.2 2007/09/26 09:05:02 mrness Exp $ inherit eutils linux-info @@ -31,7 +31,7 @@ pkg_setup() { MYMAKE="programs" elif kernel_is 2 4; then - if ! [ -d /usr/src/linux/net/ipsec ]; then + if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then eerror "You need to have an IPsec enabled 2.4.x kernel." eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" die @@ -55,37 +55,35 @@ src_unpack() { } get_make_options() { - local MY_MAKE_OPTIONS="FINALCONFDIR=/etc/ipsec \ + echo KERNELSRC=\"${KERNEL_DIR}\" \ + FINALCONFDIR=/etc/ipsec \ INC_RCDEFAULT=/etc/init.d \ INC_USRLOCAL=/usr \ INC_MANDIR=share/man \ FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ - FINALDOCDIR=/usr/share/doc/${P}" + FINALDOCDIR=/usr/share/doc/${P} \ + DESTDIR=\"${D}\" \ + USERCOMPILE=\"${CFLAGS}\" if use smartcard ; then - MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_SMARTCARD=true" + echo USE_SMARTCARD=true fi if use extra-algorithms ; then - MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_EXTRACRYPTO=true" + echo USE_EXTRACRYPTO=true fi if use weak-algorithms ; then - MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_WEAKSTUFF=true" + echo USE_WEAKSTUFF=true fi - echo ${MY_MAKE_OPTIONS} } src_compile() { - emake \ - DESTDIR="${D}" \ - USERCOMPILE="${CFLAGS}" \ - $(get_make_options) \ + eval set -- $(get_make_options) + emake "$@" \ ${MYMAKE} || die "emake failed" } src_install() { - emake \ - DESTDIR="${D}" \ - USERCOMPILE="${CFLAGS}" \ - $(get_make_options) \ + eval set -- $(get_make_options) + emake "$@" \ install || die "emake install failed" dosym /etc/ipsec/ipsec.d /etc/ipsec.d |