summaryrefslogtreecommitdiff
path: root/package/openjdk/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-03 20:12:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-03 20:12:52 +0200
commitc994348c75f154eecb5ff48392b40c45ec80de55 (patch)
tree33b17d7fd2e27565f7ec85d780896aecb8b05f70 /package/openjdk/Makefile
parent1364c92fa9897626c520ab121ebc3e6d21e73745 (diff)
fix extraction problems
Diffstat (limited to 'package/openjdk/Makefile')
-rw-r--r--package/openjdk/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index ff606bee3..20c231abe 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -30,13 +30,15 @@ ICEDTEA_VERSION:= 1.10
XALAN_NAME= xalan-j
XALAN_VERSION= 2_7_0
+# override generic extraction
+EXTRACT_OVERRIDE:= 1
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
jaxp144_01.zip \
jdk6-jaf-b20.zip \
jdk6-jaxws-b20.zip \
${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-NO_DISTFILES:= 1
+
WRKDIST= ${WRKDIR}
WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
@@ -86,8 +88,7 @@ MAKE_ENV+= ${OPENJDK_BUILD_ENV}
do-extract:
cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
- tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
- -C $(PKG_NAME)-$(PKG_VERSION)
+ tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)
cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
mkdir -p ${WRKBUILD}/drops