diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
| commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
| tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /package/pptpd | |
| parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
| parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/pptpd')
| -rw-r--r-- | package/pptpd/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 07ae9cc1a..b07203521 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= ppp kmod-crypto kmod-ppp-mppe kmod-ppp kmod-net-ipgre PKG_URL:= http://www.poptop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} -PKG_LIBC_DEPENDS:= uclibc eglibc glibc +PKG_LIBC_DEPENDS:= uclibc glibc include ${TOPDIR}/mk/package.mk |