summaryrefslogtreecommitdiff
path: root/package/openjdk7
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-21 07:41:41 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-21 07:41:41 +0200
commit90f603e2be40d996c421ae8e95464e38911eabaf (patch)
treea3a8aa942a9acf078eed1333404de22aaa106219 /package/openjdk7
parentf9292cf478867567f80ad270d4351e9a48ef4d06 (diff)
s/TOPDIR/ADK_TOPDIR/
to avoid namespace collisions in some packages, rename TOPDIR. Sorry you need to make cleandir && make prereq && make
Diffstat (limited to 'package/openjdk7')
-rw-r--r--package/openjdk7/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 00085af7a..70bcceacc 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openjdk7
PKG_VERSION:= 2.4.7
@@ -31,9 +31,9 @@ PKG_HOST_DEPENDS:= linux
PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64
PKG_LIBC_DEPENDS:= uclibc glibc musl
-include $(TOPDIR)/mk/host.mk
-include $(TOPDIR)/mk/package.mk
-include $(TOPDIR)/mk/qemu.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/qemu.mk
$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -146,5 +146,5 @@ openjdk7-install:
(cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .)
(cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .)
-include ${TOPDIR}/mk/host-bottom.mk
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/host-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk