diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/pycurl | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/pycurl')
| -rw-r--r-- | package/pycurl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile index 899bb3ddb..827693423 100644 --- a/package/pycurl/Makefile +++ b/package/pycurl/Makefile @@ -25,7 +25,7 @@ INSTALL_STYLE:= manual XAKE_FLAGS+= GCC_HONOUR_COPTS=s TARGET_CFLAGS+= -fPIC MAKE_ENV+= LDSHARED="$(TARGET_CC) -shared" -CURL_CONFIG:= $(STAGING_DIR)/usr/bin/curl-config +CURL_CONFIG:= $(STAGING_TARGET_DIR)/usr/bin/curl-config include $(TOPDIR)/mk/python.mk |