diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/pptpd | |
parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/pptpd')
-rw-r--r-- | package/pptpd/Config.in | 11 | ||||
-rw-r--r-- | package/pptpd/Makefile | 4 | ||||
-rw-r--r-- | package/pptpd/files/pptpd.init | 2 |
3 files changed, 1 insertions, 16 deletions
diff --git a/package/pptpd/Config.in b/package/pptpd/Config.in deleted file mode 100644 index 7f1144f1b..000000000 --- a/package/pptpd/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_PACKAGE_PPTPD - prompt "pptpd............................. PPTP (Point-to-Point Tunneling Protocol) server" - tristate - default n - select ADK_KPACKAGE_KMOD_NET_IPGRE - select ADK_PACKAGE_PPP - help - A Point-to-Point Tunneling Protocol server - - http://poptop.sourceforge.net/ - diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 0a5a10b87..01e1147c0 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -17,14 +17,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PPTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto TCFLAGS+= -DSBINDIR=\\\"/usr/sbin\\\" FAKE_FLAGS+= INSTALL="install" post-install: - ${INSTALL_DIR} ${IDIR_PPTPD}/etc ${INSTALL_DIR} ${IDIR_PPTPD}/etc/ppp ${INSTALL_DIR} ${IDIR_PPTPD}/usr/sbin ${INSTALL_DATA} ./files/pptpd.conf ${IDIR_PPTPD}/etc/ diff --git a/package/pptpd/files/pptpd.init b/package/pptpd/files/pptpd.init index f4f37613f..e26b1f072 100644 --- a/package/pptpd/files/pptpd.init +++ b/package/pptpd/files/pptpd.init @@ -14,7 +14,7 @@ start) pptpd ;; stop) - killall pptpd + pkill pptpd ;; restart) sh $0 stop |