diff --git a/packages/network/pptp/build b/packages/network/pptp/build deleted file mode 100755 index 4796ae23b5..0000000000 --- a/packages/network/pptp/build +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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. -# -# OpenELEC 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 OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - make PPPD="/usr/sbin/pppd" CC="$CC" CFLAGS="$CFLAGS" config.h pptp - diff --git a/packages/network/pptp/install b/packages/network/pptp/install deleted file mode 100755 index 8b67730eb2..0000000000 --- a/packages/network/pptp/install +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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. -# -# OpenELEC 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 OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/pptp $INSTALL/usr/sbin diff --git a/packages/network/pptp/meta b/packages/network/pptp/package.mk similarity index 85% rename from packages/network/pptp/meta rename to packages/network/pptp/package.mk index dd364e5c5f..01c681b068 100644 --- a/packages/network/pptp/meta +++ b/packages/network/pptp/package.mk @@ -23,12 +23,21 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://pptpclient.sourceforge.net" PKG_URL="$SOURCEFORGE_SRC/project/pptpclient/pptp/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="ppp" -PKG_BUILD_DEPENDS="toolchain ppp" +PKG_DEPENDS_TARGET="ppp" +PKG_BUILD_DEPENDS_TARGET="toolchain ppp" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="pptp: a Linux, FreeBSD, NetBSD and OpenBSD client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP" PKG_LONGDESC="PPTP Client is a Linux, FreeBSD, NetBSD and OpenBSD client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP. Allows connection to a PPTP based Virtual Private Network (VPN)." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +make_target() { + make PPPD="/usr/sbin/pppd" CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" config.h pptp +} + +makeinstall_target() { + mkdir -p $INSTALL/usr/sbin + cp -P pptp $INSTALL/usr/sbin +} \ No newline at end of file