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/lsof/Makefile | |
parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) |
resolve conflict
Diffstat (limited to 'package/lsof/Makefile')
-rw-r--r-- | package/lsof/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/lsof/Makefile b/package/lsof/Makefile index 6415703fc..478d63a17 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -27,7 +27,7 @@ $(eval $(call PKG_template,LSOF,lsof,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS CONFIG_STYLE:= minimal CONFIGURE_PROG:= Configure CONFIGURE_ARGS:= -n linux -XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc' +XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_TARGET_DIR)/usr/include/tirpc' XAKE_FLAGS+= CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc' INSTALL_STYLE:= manual |