summaryrefslogtreecommitdiff
path: root/package/openjdk7
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-10 16:22:19 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-10 16:22:19 +0100
commit6e58f05aaae4943de494bc30dd3bf184a6d676f2 (patch)
tree708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/openjdk7
parent214429f44ebf9c57af50b9475c4dbec3d58fb089 (diff)
parentf1623c84fde6428190d0dcdcf4471938ec0ae109 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk7')
-rw-r--r--package/openjdk7/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index b86680a7b..8376e715a 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -89,9 +89,9 @@ CONFIGURE_ARGS+= --disable-bootstrap
CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
- ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \
- ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
- ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
+ ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \
+ ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
+ ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \