summaryrefslogtreecommitdiff
path: root/package/openjdk/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-03 17:44:46 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-03 17:44:46 +0200
commit8a75e236880e3c426edd1af19a052fae3e1fd270 (patch)
tree5f10f5d22e573dd620f1d2cf0caa165bdab78b88 /package/openjdk/Makefile
parent45ec86f9056dc8b7c2718a28ef7ac0cff6b7701e (diff)
merge some changes, cosmetic fixes
Diffstat (limited to 'package/openjdk/Makefile')
-rw-r--r--package/openjdk/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index cf81f7cab..ff606bee3 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -85,15 +85,17 @@ CONFIGURE_ENV+= ${OPENJDK_BUILD_ENV}
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))
- (cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+ 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)
+ 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
cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
- ${WRKBUILD}/drops/
+ ${WRKBUILD}/drops
-x-pre-configure:
- cd ${WRKBUILD}; rm -rf config.{cache,status};\
+pre-configure:
+ cd ${WRKBUILD}; rm -rf config.{cache,status}; \
export ${OPENJDK_BUILD_ENV}; ./configure \
--enable-bootstrap \
--enable-zero \