summaryrefslogtreecommitdiff
path: root/package/openjdk7
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-11 14:21:31 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-11 14:21:31 +0100
commitd65d767c45ebce8001ec1e028fba9d7881b5f847 (patch)
tree93d6a8b9f94efaa754619cc54c4dd46d29ed5036 /package/openjdk7
parentf9c7b800e7bf803b808cdbefd645a6878d0a101e (diff)
parent2e0e960c27afd0218d58157eefc89d5456406035 (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)' \