Browse Source

s/TOPDIR/ADK_TOPDIR/

to avoid namespace collisions in some packages, rename TOPDIR.
Sorry you need to make cleandir && make prereq && make
Waldemar Brodkorb 7 years ago
parent
commit
90f603e2be
100 changed files with 397 additions and 397 deletions
  1. 3 3
      BSDmakefile
  2. 4 4
      GNUmakefile
  3. 2 2
      Makefile
  4. 1 1
      adk/config/Makefile
  5. 1 1
      adk/config/Makefile.in
  6. 1 1
      adk/tests/master.exp.in
  7. 2 2
      adk/tools/Makefile
  8. 1 1
      docs/Makefile
  9. 3 3
      docs/adding-packages-auto.txt
  10. 10 10
      docs/adding-packages-host.txt
  11. 3 3
      docs/adding-packages-manual.txt
  12. 68 68
      mk/build.mk
  13. 3 3
      mk/buildhlp.mk
  14. 4 4
      mk/image.mk
  15. 5 5
      mk/kernel-build.mk
  16. 1 1
      mk/kernel.mk
  17. 1 1
      mk/package.mk
  18. 2 2
      mk/vars.mk
  19. 3 3
      package/.template/Makefile
  20. 3 3
      package/.templatelib/Makefile
  21. 3 3
      package/.templateprog/Makefile
  22. 3 3
      package/6tunnel/Makefile
  23. 3 3
      package/DirectFB/Makefile
  24. 3 3
      package/ImageMagick/Makefile
  25. 4 4
      package/Makefile
  26. 3 3
      package/SDL_gfx/Makefile
  27. 3 3
      package/SDL_ttf/Makefile
  28. 5 5
      package/adk-helper/Makefile
  29. 3 3
      package/adk-test-tools/Makefile
  30. 3 3
      package/adkinstall/Makefile
  31. 3 3
      package/aiccu/Makefile
  32. 3 3
      package/aircrack-ng/Makefile
  33. 3 3
      package/alix-switch/Makefile
  34. 3 3
      package/alix-temperature/Makefile
  35. 5 5
      package/alsa-lib/Makefile
  36. 3 3
      package/alsa-utils/Makefile
  37. 5 5
      package/ant/Makefile
  38. 3 3
      package/apr-util/Makefile
  39. 3 3
      package/apr/Makefile
  40. 3 3
      package/arpd/Makefile
  41. 3 3
      package/arpwatch/Makefile
  42. 3 3
      package/asterisk/Makefile
  43. 7 7
      package/atftp/Makefile
  44. 3 3
      package/atk/Makefile
  45. 5 5
      package/autoconf/Makefile
  46. 5 5
      package/automake/Makefile
  47. 3 3
      package/autossh/Makefile
  48. 3 3
      package/avahi/Makefile
  49. 3 3
      package/axtls/Makefile
  50. 3 3
      package/b43-firmware/Makefile
  51. 4 4
      package/base-files/Makefile
  52. 3 3
      package/bash/Makefile
  53. 5 5
      package/bc/Makefile
  54. 3 3
      package/bcm2835-bootloader/Makefile
  55. 3 3
      package/bcm2835-vc/Makefile
  56. 3 3
      package/bdftopcf/Makefile
  57. 3 3
      package/beecrypt/Makefile
  58. 3 3
      package/bigreqsproto/Makefile
  59. 3 3
      package/bind/Makefile
  60. 4 4
      package/binutils/Makefile
  61. 5 5
      package/bison/Makefile
  62. 3 3
      package/bitlbee/Makefile
  63. 3 3
      package/bkeymaps/Makefile
  64. 3 3
      package/bluez-firmware/Makefile
  65. 3 3
      package/bluez/Makefile
  66. 3 3
      package/bogofilter/Makefile
  67. 4 4
      package/boost/Makefile
  68. 3 3
      package/boot-wrapper-aarch64/Makefile
  69. 3 3
      package/brcm-bluetooth/Makefile
  70. 3 3
      package/brcmfmac-firmware/Makefile
  71. 3 3
      package/bridge-utils/Makefile
  72. 5 5
      package/busybox/Makefile
  73. 3 3
      package/bwm/Makefile
  74. 5 5
      package/bzip2/Makefile
  75. 4 4
      package/bzr/Makefile
  76. 3 3
      package/ca-certificates/Makefile
  77. 5 5
      package/cairo/Makefile
  78. 5 5
      package/ccache/Makefile
  79. 3 3
      package/ccid/Makefile
  80. 5 5
      package/cdrtools/Makefile
  81. 3 3
      package/cfgfs/Makefile
  82. 3 3
      package/cgilib/Makefile
  83. 3 3
      package/check/Makefile
  84. 3 3
      package/cherokee/Makefile
  85. 4 4
      package/cherrypy/Makefile
  86. 3 3
      package/chillispot/Makefile
  87. 3 3
      package/cifs-utils/Makefile
  88. 5 5
      package/classpath/Makefile
  89. 5 5
      package/cmake/Makefile
  90. 3 3
      package/collectd/Makefile
  91. 3 3
      package/comgt/Makefile
  92. 3 3
      package/compositeproto/Makefile
  93. 3 3
      package/confuse/Makefile
  94. 3 3
      package/conntrack-tools/Makefile
  95. 3 3
      package/coreutils/Makefile
  96. 3 3
      package/cpio/Makefile
  97. 3 3
      package/cpufrequtils/Makefile
  98. 3 3
      package/cryptinit/Makefile
  99. 4 4
      package/cryptodev-linux/Makefile
  100. 0 0
      package/cryptsetup/Makefile

+ 3 - 3
BSDmakefile

@@ -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.
 
-TOPDIR=		${.CURDIR}
+ADK_TOPDIR=		${.CURDIR}
 PWD=		${.CURDIR}
 
 .include "${.CURDIR}/Makefile.inc"
@@ -9,7 +9,7 @@ PWD=		${.CURDIR}
 .if defined(package) && !empty(package)
 subdir:=	package/${package}
 .  if !make(clean)
-_subdir_dep:=	${TOPDIR}/.config
+_subdir_dep:=	${ADK_TOPDIR}/.config
 .  endif
 .endif
 
@@ -22,7 +22,7 @@ _subdir: ${_subdir_dep}
 		echo >&2 Error: you must build with “umask 022”, sorry.; \
 		exit 1; \
 	fi
-	cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \
+	cd ${.CURDIR}/${subdir} && ADK_TOPDIR=${.CURDIR} DEVELOPER=1 \
 	    ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir}
 
 .  include "${.CURDIR}/prereq.mk"

+ 4 - 4
GNUmakefile

@@ -1,14 +1,14 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-TOPDIR:=	$(shell pwd)
-PWD:=		${TOPDIR}
+ADK_TOPDIR:=	$(shell pwd)
+PWD:=		${ADK_TOPDIR}
 
 include Makefile.inc
 
 ifneq (${package},)
 subdir:=	package/${package}
-_subdir_dep:=	${TOPDIR}/.config
+_subdir_dep:=	${ADK_TOPDIR}/.config
 endif
 
 ifneq (${subdir},)
@@ -19,7 +19,7 @@ _subdir: ${_subdir_dep}
 		echo >&2 Error: you must build with “umask 022”, sorry.; \
 		exit 1; \
 	fi
-	cd ${subdir} && TOPDIR=${TOPDIR} DEVELOPER=1 \
+	cd ${subdir} && ADK_TOPDIR=${ADK_TOPDIR} DEVELOPER=1 \
 	    make VERBOSE=1 ${MAKEFLAGS} ${MAKECMDGOALS}
 
 include prereq.mk

+ 2 - 2
Makefile

@@ -183,7 +183,7 @@ NO_ERROR=0
 		echo >&2 Error: you must build with umask 022, sorry.; \
 		exit 1; \
 	fi
-	@echo "TOPDIR:=$$(readlink -nf . 2>/dev/null || pwd -P)" >prereq.mk
+	@echo "ADK_TOPDIR:=$$(readlink -nf . 2>/dev/null || pwd -P)" >prereq.mk
 	@echo "BASH:=$$(which bash)" >>prereq.mk
 	@if [ -z "$$(which gmake 2>/dev/null )" ]; then \
 		echo "GMAKE:=$$(which make)" >>prereq.mk ;\
@@ -208,7 +208,7 @@ NO_ERROR=0
 	@echo 'MAKE:=$${GMAKE}' >>prereq.mk
 	@echo "OStype:=$$(env uname)" >>prereq.mk
 	@echo "_PATH:=$$PATH" >>prereq.mk
-	@echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
+	@echo "PATH:=\$${ADK_TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
 	@echo "SHELL:=$$(which bash)" >>prereq.mk
 	@echo "GIT:=$$(which git 2>/dev/null)" >>prereq.mk
 	@env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \

+ 1 - 1
adk/config/Makefile

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 ifneq ($(filter-out clean,${MAKECMDGOALS}),)
-include ${TOPDIR}/rules.mk
+include ${ADK_TOPDIR}/rules.mk
 endif
 
 CP=cp -fpR

+ 1 - 1
adk/config/Makefile.in

@@ -2,4 +2,4 @@ ifeq ($(strip $(ADK_PACKAGE_CONFIG)),y)
 TARGETS+=config
 endif
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 1 - 1
adk/tests/master.exp.in

@@ -1,4 +1,4 @@
-lappend boards_dir @TOPDIR@/tests
+lappend boards_dir @ADK_TOPDIR@/tests
 lappend boards_dir /usr/share/dejagnu
 set myboard adk
 set target_list adk

+ 2 - 2
adk/tools/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
 
 install: ${STAGING_HOST_DIR}/usr/bin/depmaker ${STAGING_HOST_DIR}/usr/bin/pkgrebuild ${STAGING_HOST_DIR}/usr/bin/dkgetsz
 
@@ -14,4 +14,4 @@ ${STAGING_HOST_DIR}/usr/bin/pkgrebuild: pkgrebuild.c strmap.c
 ${STAGING_HOST_DIR}/usr/bin/dkgetsz: dkgetsz.c
 	${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c
 
-include $(TOPDIR)/mk/tools.mk
+include $(ADK_TOPDIR)/mk/tools.mk

+ 1 - 1
docs/Makefile

@@ -1,4 +1,4 @@
-TOPDIR=$(pwd)
+ADK_TOPDIR=$(pwd)
 
 all:	pdf text html
 

+ 3 - 3
docs/adding-packages-auto.txt

@@ -13,7 +13,7 @@ package, with an example:
 01: # This file is part of the OpenADK project. OpenADK is copyrighted
 02: # material, please see the LICENCE file in the top-level directory.
 03: 
-04: include ${TOPDIR}/rules.mk
+04: include ${ADK_TOPDIR}/rules.mk
 05:
 06: PKG_NAME:=		libfoo
 07: PKG_VERSION:=	1.0
@@ -26,7 +26,7 @@ package, with an example:
 14: PKG_URL:=		http://www.libfoo.org/
 15: PKG_SITES:=		http://downloads.libfoo.org/
 16:
-17: include ${TOPDIR}/mk/package.mk
+17: include ${ADK_TOPDIR}/mk/package.mk
 18:
 19: $(eval $(call PKG_template,LIBFOO,libfoo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 20:
@@ -34,7 +34,7 @@ package, with an example:
 22:	${INSTALL_DIR} ${IDIR_LIBFOO}/usr/lib
 23:	${CP} ${WRKINST}/usr/lib/libfoo.so* ${IDIR_LIBFOO}/usr/lib
 24:
-25: include ${TOPDIR}/mk/pkg-bottom.mk
+25: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
 
 ------------------------
 

+ 10 - 10
docs/adding-packages-host.txt

@@ -13,7 +13,7 @@ by another target package to build, with an example:
 01: # This file is part of the OpenADK project. OpenADK is copyrighted
 02: # material, please see the LICENCE file in the top-level directory.
 03:
-04: include $(TOPDIR)/rules.mk
+04: include $(ADK_TOPDIR)/rules.mk
 05:
 06: PKG_NAME:=              hostfoo
 07: PKG_VERSION:=           1.0
@@ -26,15 +26,15 @@ by another target package to build, with an example:
 14:
 15: PKG_CFLINE_HOSTFOO:=    depends on ADK_HOST_ONLY
 16:
-17: include $(TOPDIR)/mk/host.mk
-18: include $(TOPDIR)/mk/package.mk
+17: include $(ADK_TOPDIR)/mk/host.mk
+18: include $(ADK_TOPDIR)/mk/package.mk
 19:
 20: $(eval $(call HOST_template,HOSTFOO,hostfoo,$(PKG_VERSION)-${PKG_RELEASE}))
 21:
 22: HOST_STYLE:=            auto
 23:
-24: include ${TOPDIR}/mk/host-bottom.mk
-25: include ${TOPDIR}/mk/pkg-bottom.mk
+24: include ${ADK_TOPDIR}/mk/host-bottom.mk
+25: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
 ------------------------
 
 The differences to a target package is the inclusion of +mk/host.mk+ in line 17 and
@@ -47,7 +47,7 @@ Following mix between host and target package is possible, too:
 01: # This file is part of the OpenADK project. OpenADK is copyrighted
 02: # material, please see the LICENCE file in the top-level directory.
 03:
-04: include ${TOPDIR}/rules.mk
+04: include ${ADK_TOPDIR}/rules.mk
 05:
 06: PKG_NAME:=		foo
 07: PKG_VERSION:=	1.0
@@ -59,8 +59,8 @@ Following mix between host and target package is possible, too:
 13: PKG_URL:=		http://www.foo.org/
 14: PKG_SITES:=		http://download.foo.org/
 15:
-16: include ${TOPDIR}/mk/host.mk
-17: include ${TOPDIR}/mk/package.mk
+16: include ${ADK_TOPDIR}/mk/host.mk
+17: include ${ADK_TOPDIR}/mk/package.mk
 18:
 19: $(eval $(call HOST_template,FOO,foo,${PKG_VERSION}-${PKG_RELEASE}))
 20: $(eval $(call PKG_template,FOO,foo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -71,8 +71,8 @@ Following mix between host and target package is possible, too:
 25:	${INSTALL_DIR} ${IDIR_FOO}/usr/bin
 26:	${INSTALL_BIN} ${WRKINST}/usr/bin/foo ${IDIR_FOO}/usr/bin
 27:
-28: include ${TOPDIR}/mk/host-bottom.mk
-29: include ${TOPDIR}/mk/pkg-bottom.mk
+28: include ${ADK_TOPDIR}/mk/host-bottom.mk
+29: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
 ------------------------
 
 If you need to rebuild a mixed package, you can do:

+ 3 - 3
docs/adding-packages-manual.txt

@@ -15,7 +15,7 @@ scripts.
 01: # This file is part of the OpenADK project. OpenADK is copyrighted
 02: # material, please see the LICENCE file in the top-level directory.
 03:
-04: include $(TOPDIR)/rules.mk
+04: include $(ADK_TOPDIR)/rules.mk
 05:
 06: PKG_NAME:=		libfoo
 07: PKG_VERSION:=	1.0
@@ -28,7 +28,7 @@ scripts.
 14: PKG_URL:=		http://www.libfoo.org/
 15: PKG_SITES:=		http://download.libfoo.org/
 16:
-17: include $(TOPDIR)/mk/package.mk
+17: include $(ADK_TOPDIR)/mk/package.mk
 18:
 19: $(eval $(call PKG_template,LIBFOO,libfoo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 20:
@@ -46,7 +46,7 @@ scripts.
 32:	${INSTALL_DIR} ${IDIR_LIBFOO}/usr/lib
 33:	${CP} ${WRKBUILD}/libfoo.so* ${IDIR_LIBFOO}/usr/lib
 34:
-35: include ${TOPDIR}/mk/pkg-bottom.mk
+35: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
 --------------------------------
 
 The Makefile begins with line 4 with the inclusion of the top level rules.mk

+ 68 - 68
mk/build.mk

@@ -1,8 +1,8 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-TOPDIR=$(shell pwd)
-export TOPDIR
+ADK_TOPDIR=$(shell pwd)
+export ADK_TOPDIR
 
 ifneq ($(shell umask 2>/dev/null | sed 's/0*022/OK/'),OK)
 $(error your umask is not 022)
@@ -101,7 +101,7 @@ POSTCONFIG=		-@\
 	if [ -f .adkinit ];then rm .adkinit;\
 	else \
 	if [ -f .config.old ];then \
-		$(TOPDIR)/adk/tools/pkgrebuild;\
+		$(ADK_TOPDIR)/adk/tools/pkgrebuild;\
 		rebuild=0; \
 		if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
 			touch .rebuild.busybox;\
@@ -140,17 +140,17 @@ POSTCONFIG=		-@\
 
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR)/.config
+-include $(ADK_TOPDIR)/.config
 endif
 
 ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 all: world
 
-${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/depmaker
+${ADK_TOPDIR}/package/Depends.mk: ${ADK_TOPDIR}/.config $(wildcard ${ADK_TOPDIR}/package/*/Makefile) $(ADK_TOPDIR)/adk/tools/depmaker
 	@echo "Generating dependencies ..."
-	$(TOPDIR)/adk/tools/depmaker > ${TOPDIR}/package/Depends.mk
+	$(ADK_TOPDIR)/adk/tools/depmaker > ${ADK_TOPDIR}/package/Depends.mk
 
 .NOTPARALLEL:
 .PHONY: all world clean cleandir cleansystem distclean image_clean
@@ -158,7 +158,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 world:
 	@mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
-	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
+	${BASH} ${ADK_TOPDIR}/scripts/scan-pkgs.sh
 ifeq ($(ADK_TARGET_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk package/hostcompile toolchain/fixup package/compile
@@ -172,7 +172,7 @@ endif
 package_index:
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
 	-cd ${PACKAGE_DIR} && \
-	    ${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages
+	    ${BASH} ${ADK_TOPDIR}/scripts/ipkg-make-index.sh . >Packages
 endif
 
 ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
@@ -189,7 +189,7 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
 	echo "option offline_root ${TARGET_DIR}" >>$(STAGING_TARGET_DIR)/etc/ipkg.conf
 endif
 
-package/%: ${STAGING_TARGET_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
+package/%: ${STAGING_TARGET_DIR}/etc/ipkg.conf ${ADK_TOPDIR}/package/Depends.mk
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
 target/%:
@@ -213,11 +213,11 @@ kernelconfig:
 # create a new package from package/.template
 newpackage:
 	@echo "Creating new package $(PKG)"
-	$(CP) $(TOPDIR)/package/.template$(TYPE) $(TOPDIR)/package/$(PKG)
+	$(CP) $(ADK_TOPDIR)/package/.template$(TYPE) $(ADK_TOPDIR)/package/$(PKG)
 	pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \
-		$(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile
-	$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
-	$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
+		$(SED) "s#@UPKG@#$$pkg#" $(ADK_TOPDIR)/package/$(PKG)/Makefile
+	$(SED) 's#@PKG@#$(PKG)#' $(ADK_TOPDIR)/package/$(PKG)/Makefile
+	$(SED) 's#@VER@#$(VER)#' $(ADK_TOPDIR)/package/$(PKG)/Makefile
 	@echo "Edit package/$(PKG)/Makefile to complete"
 
 root_clean:
@@ -241,8 +241,8 @@ clean:
 		rm ${STAGING_PKG_DIR}/$$f ; \
 	done
 	rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \
-	    	${TOPDIR}/package/pkglist.d
-	rm -f ${TOPDIR}/package/Depends.mk
+	    	${ADK_TOPDIR}/package/pkglist.d
+	rm -f ${ADK_TOPDIR}/package/Depends.mk
 
 cleankernel:
 	@$(TRACE) cleankernel
@@ -252,36 +252,36 @@ cleandir:
 	@$(TRACE) cleandir
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) 
 	@rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	    ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX)
 	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	@rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+	@rm -f .menu .tmpconfig.h .rebuild* ${ADK_TOPDIR}/package/Depends.mk ${ADK_TOPDIR}/prereq.mk
 
 cleansystem:
 	@$(TRACE) cleansystem
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) 
 	@rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	    ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_DIR) $(STAGING_TARGET_DIR) $(STAGING_PKG_DIR) $(TOOLCHAIN_BUILD_DIR)
-	@rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+	@rm -f .menu .tmpconfig.h .rebuild* ${ADK_TOPDIR}/package/Depends.mk ${ADK_TOPDIR}/prereq.mk
 
 distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
 	@rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	    ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX)
 	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
-	    .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* \
-	    ${TOPDIR}/target/*/Config.in.{arch*,system*} ${TOPDIR}/package/Config.in.auto*
+	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${ADK_TOPDIR}/prereq.mk \
+	    .menu ${ADK_TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* \
+	    ${ADK_TOPDIR}/target/*/Config.in.{arch*,system*} ${ADK_TOPDIR}/package/Config.in.auto*
 
 else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
-include ${TOPDIR}/mk/vars.mk
+include ${ADK_TOPDIR}/mk/vars.mk
 else
-include $(TOPDIR)/prereq.mk
+include $(ADK_TOPDIR)/prereq.mk
 export HOST_CC BASH MAKE LANGUAGE LC_ALL OStype PATH QEMU SHELL
 endif
 
@@ -302,59 +302,59 @@ $(CONFIG)/mconf:
 
 defconfig: .menu $(CONFIG)/conf
 ifeq (${OStype},Linux)
-	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_LINUX=y > $(ADK_TOPDIR)/.defconfig
 endif
 ifeq (${OStype},FreeBSD)
-	@echo ADK_HOST_FREEBSD=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_FREEBSD=y > $(ADK_TOPDIR)/.defconfig
 endif
 ifeq (${OStype},MirBSD)
-	@echo ADK_HOST_MIRBSD=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_MIRBSD=y > $(ADK_TOPDIR)/.defconfig
 endif
 ifeq (${OStype},OpenBSD)
-	@echo ADK_HOST_OPENBSD=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_OPENBSD=y > $(ADK_TOPDIR)/.defconfig
 endif
 ifeq (${OStype},NetBSD)
-	@echo ADK_HOST_NETBSD=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_NETBSD=y > $(ADK_TOPDIR)/.defconfig
 endif
 ifeq (${OStype},Darwin)
-	@echo ADK_HOST_DARWIN=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_DARWIN=y > $(ADK_TOPDIR)/.defconfig
 endif
 ifneq (,$(filter CYGWIN%,${OStype}))
-	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
+	@echo ADK_HOST_CYGWIN=y > $(ADK_TOPDIR)/.defconfig
 endif
 	@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \
 		grep "^config" target/config/Config.in.arch.choice \
 			|grep -i "$(ADK_TARGET_ARCH)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			 >> $(TOPDIR)/.defconfig; \
+			 >> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@for symbol in ${DEFCONFIG}; do \
-		echo $$symbol >> $(TOPDIR)/.defconfig; \
+		echo $$symbol >> $(ADK_TOPDIR)/.defconfig; \
 	done
 	@if [ ! -z "$(ADK_TARGET_FS)" ];then \
 		grep "^config" target/config/Config.in.target \
 			|grep -i "$(ADK_TARGET_FS)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/.defconfig; \
+			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_COLLECTION)" ];then \
 		grep -h "^config" target/packages/pkg-available/* \
 			|grep -i "$(ADK_TARGET_COLLECTION)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/.defconfig; \
+			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_LIBC)" ];then \
 		grep "^config" target/config/Config.in.libc.choice \
 			|grep -i "$(ADK_TARGET_LIBC)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/.defconfig; \
+			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_SYSTEM)" ];then \
 		system=$$(echo "$(ADK_TARGET_SYSTEM)" |sed -e "s/-/_/g"); \
 		grep -h "^config" target/*/Config.in.systems \
 			|grep -i "$$system$$" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/.defconfig; \
+			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_SYSTEM)" ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
@@ -362,53 +362,53 @@ endif
 
 modconfig:
 ifeq (${OStype},Linux)
-	@echo ADK_HOST_LINUX=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_LINUX=y > $(ADK_TOPDIR)/all.config
 endif
 ifeq (${OStype},FreeBSD)
-	@echo ADK_HOST_FREEBSD=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_FREEBSD=y > $(ADK_TOPDIR)/all.config
 endif
 ifeq (${OStype},MirBSD)
-	@echo ADK_HOST_MIRBSD=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_MIRBSD=y > $(ADK_TOPDIR)/all.config
 endif
 ifeq (${OStype},OpenBSD)
-	@echo ADK_HOST_OPENBSD=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_OPENBSD=y > $(ADK_TOPDIR)/all.config
 endif
 ifeq (${OStype},NetBSD)
-	@echo ADK_HOST_NETBSD=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_NETBSD=y > $(ADK_TOPDIR)/all.config
 endif
 ifeq (${OStype},Darwin)
-	@echo ADK_HOST_DARWIN=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_DARWIN=y > $(ADK_TOPDIR)/all.config
 endif
 ifneq (,$(filter CYGWIN%,${OStype}))
-	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
+	@echo ADK_HOST_CYGWIN=y > $(ADK_TOPDIR)/all.config
 endif
 	@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \
 		grep "^config" target/config/Config.in.arch.choice \
 			|grep -i "$(ADK_TARGET_ARCH)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/all.config; \
+			>> $(ADK_TOPDIR)/all.config; \
 	fi
 	@for symbol in ${DEFCONFIG}; do \
-		echo $$symbol >> $(TOPDIR)/all.config; \
+		echo $$symbol >> $(ADK_TOPDIR)/all.config; \
 	done
 	@if [ ! -z "$(ADK_TARGET_FS)" ];then \
 		grep "^config" target/config/Config.in.target \
 			|grep -i "$(ADK_TARGET_FS)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/all.config; \
+			>> $(ADK_TOPDIR)/all.config; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_LIBC)" ];then \
 		grep "^config" target/config/Config.in.libc.choice \
 			|grep -i "$(ADK_TARGET_LIBC)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/all.config; \
+			>> $(ADK_TOPDIR)/all.config; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_SYSTEM)" ];then \
 		system=$$(echo "$(ADK_TARGET_SYSTEM)" |sed -e "s/-/_/g"); \
 		grep -h "^config" target/*/Config.in.systems \
 			|grep -i "$$system" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/all.config; \
+			>> $(ADK_TOPDIR)/all.config; \
 	fi
 
 menuconfig: $(CONFIG)/mconf defconfig .menu
@@ -431,12 +431,12 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	    ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_TARGET_DIR_PFX)
 	@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
-	    .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG \
-	    ${TOPDIR}/target/*/Config.in.{arch*,system*} ${TOPDIR}/package/Config.in.auto*
+	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${ADK_TOPDIR}/prereq.mk \
+	    .menu .rebuild.* ${ADK_TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG \
+	    ${ADK_TOPDIR}/target/*/Config.in.{arch*,system*} ${ADK_TOPDIR}/package/Config.in.auto*
 
 endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
@@ -446,43 +446,43 @@ buildall:
 	$(GMAKE) ADK_TARGET_ARCH=$(ADK_TARGET_ARCH) ADK_TARGET_SYSTEM=$(ADK_TARGET_SYSTEM) ADK_TARGET_LIBC=$(ADK_TARGET_LIBC) allmodconfig
 	$(GMAKE) VERBOSE=1 all 2>&1 | tee firmware/buildall.log
 
-$(TOPDIR)/adk/tools/pkgmaker: $(TOPDIR)/adk/tools/pkgmaker.c $(TOPDIR)/adk/tools/sortfile.c $(TOPDIR)/adk/tools/strmap.c
+$(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c
 	@$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
 
-$(TOPDIR)/adk/tools/pkgrebuild: $(TOPDIR)/adk/tools/pkgrebuild.c $(TOPDIR)/adk/tools/strmap.c
+$(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c
 	@$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
 
-$(TOPDIR)/adk/tools/depmaker: $(TOPDIR)/adk/tools/depmaker.c
-	@$(HOST_CC) $(HOST_CFLAGS) -o $@ $(TOPDIR)/adk/tools/depmaker.c
+$(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
+	@$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
 
-menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild
+menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild
 	@echo "Generating menu structure ..."
-	@$(BASH) $(TOPDIR)/scripts/create-menu
-	@$(TOPDIR)/adk/tools/pkgmaker
+	@$(BASH) $(ADK_TOPDIR)/scripts/create-menu
+	@$(ADK_TOPDIR)/adk/tools/pkgmaker
 	@:>.menu
 
-dep: $(TOPDIR)/adk/tools/depmaker
+dep: $(ADK_TOPDIR)/adk/tools/depmaker
 	@echo "Generating dependencies ..."
-	@$(TOPDIR)/adk/tools/depmaker > ${TOPDIR}/package/Depends.mk
+	@$(ADK_TOPDIR)/adk/tools/depmaker > ${ADK_TOPDIR}/package/Depends.mk
 
 .PHONY: menu dep
 
-include $(TOPDIR)/toolchain/gcc/Makefile.inc
+include $(ADK_TOPDIR)/toolchain/gcc/Makefile.inc
 
 check-dejagnu:
 	@-rm adk/tests/adk.exp adk/tests/master.exp >/dev/null 2>&1
 	@sed -e "s#@ADK_TARGET_IP@#$(ADK_TARGET_IP)#" \
 		-e "s#@ADK_TARGET_PORT@#$(ADK_TARGET_PORT)#" \
 		adk/tests/adk.exp.in > adk/tests/adk.exp
-	@sed -e "s#@TOPDIR@#$(TOPDIR)#" adk/tests/master.exp.in > \
+	@sed -e "s#@ADK_TOPDIR@#$(ADK_TOPDIR)#" adk/tests/master.exp.in > \
 		adk/tests/master.exp
 
 check-gcc: check-dejagnu
-	env DEJAGNU=$(TOPDIR)/adk/tests/master.exp \
+	env DEJAGNU=$(ADK_TOPDIR)/adk/tests/master.exp \
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc
 
 check-g++: check-dejagnu
-	env DEJAGNU=$(TOPDIR)/adk/tests/master.exp \
+	env DEJAGNU=$(ADK_TOPDIR)/adk/tests/master.exp \
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-g++
 
 check: check-gcc check-g++

+ 3 - 3
mk/buildhlp.mk

@@ -40,7 +40,7 @@ fetch refetch checksum do-extract:
 
 __use_generic_patch_target:=42
 else ifneq ($(strip ${DISTFILES}),)
-include ${TOPDIR}/mk/fetch.mk
+include ${ADK_TOPDIR}/mk/fetch.mk
 
 ${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
 ifeq (${_CHECKSUM_COOKIE},)
@@ -56,7 +56,7 @@ endif
 
 __use_generic_patch_target:=42
 else
-include ${TOPDIR}/mk/fetch.mk
+include ${ADK_TOPDIR}/mk/fetch.mk
 ${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
 	$(MAKE) fetch
 ifeq (${_CHECKSUM_COOKIE},)
@@ -102,6 +102,6 @@ endif
 	    WRKDIR1=$(call shellescape,${WRKDIR}) \
 	    PATH=$(call shellescape,${HOST_PATH}) \
 	    $(call shellexport,DIFF_IGNOREFILES) \
-	    mksh ${TOPDIR}/scripts/update-patches2
+	    mksh ${ADK_TOPDIR}/scripts/update-patches2
 
 .PHONY: update-patches host-update-patches

+ 4 - 4
mk/image.mk

@@ -31,13 +31,13 @@ endif
 
 imageprepare: image-prepare-post extra-install
 
-# if an extra directory exist in TOPDIR, copy all content over the 
+# if an extra directory exist in ADK_TOPDIR, copy all content over the 
 # root directory, do the same if make extra=/dir/to/extra is used
 extra-install:
-	@-if [ -h ${TARGET_DIR}/etc/resolv.conf -a -f $(TOPDIR)/extra/etc/resolv.conf ];then \
+	@-if [ -h ${TARGET_DIR}/etc/resolv.conf -a -f $(ADK_TOPDIR)/extra/etc/resolv.conf ];then \
 		rm ${TARGET_DIR}/etc/resolv.conf;\
 	fi
-	@if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi
+	@if [ -d $(ADK_TOPDIR)/extra ];then $(CP) $(ADK_TOPDIR)/extra/* ${TARGET_DIR};fi
 	@if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi
 
 image-prepare-post:
@@ -57,7 +57,7 @@ image-prepare-post:
 		> $(TARGET_DIR)/etc/.adkversion
 	echo $(ADK_TARGET_SYSTEM) > $(TARGET_DIR)/etc/.adktarget
 ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
-	gzip -9c ${TOPDIR}/.config > $(TARGET_DIR)/etc/adkconfig.gz
+	gzip -9c ${ADK_TOPDIR}/.config > $(TARGET_DIR)/etc/adkconfig.gz
 	chmod 600 $(TARGET_DIR)/etc/adkconfig.gz
 endif
 ifneq ($(ADK_LINUX_X86_64)$(ADK_LINUX_PPC64)$(ADK_LINUX_SPARC64)$(ADK_TARGET_ABI_N32)$(ADK_TARGET_ABI_N64),)

+ 5 - 5
mk/kernel-build.mk

@@ -1,10 +1,10 @@
 # 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 ${TOPDIR}/mk/kernel-ver.mk
-include $(TOPDIR)/mk/linux.mk
-include ${TOPDIR}/mk/kernel-vars.mk
+include $(ADK_TOPDIR)/rules.mk
+include ${ADK_TOPDIR}/mk/kernel-ver.mk
+include $(ADK_TOPDIR)/mk/linux.mk
+include ${ADK_TOPDIR}/mk/kernel-vars.mk
 
 KERNEL_FILE:=$(ADK_TARGET_KERNEL)
 KERNEL_TARGET:=$(ADK_TARGET_KERNEL)
@@ -31,7 +31,7 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
 	mkdir -p $(LINUX_BUILD_DIR)/kmod-control
 	touch $@
 
-$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk
+$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(ADK_TOPDIR)/mk/modules.mk
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config

+ 1 - 1
mk/kernel.mk

@@ -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)/mk/kernel-ver.mk
+include $(ADK_TOPDIR)/mk/kernel-ver.mk
 
 LINUX_KMOD_SUFFIX=ko
 MODULES_SUBDIR := lib/modules/$(KERNEL_MOD_VERSION)

+ 1 - 1
mk/package.mk

@@ -62,7 +62,7 @@ _FAKE_COOKIE=		${WRKINST}/.fake_done
 _IPKGS_COOKIE=		${STAGING_PKG_DIR}/stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}
 
 _IN_PACKAGE:=		1
-include ${TOPDIR}/mk/buildhlp.mk
+include ${ADK_TOPDIR}/mk/buildhlp.mk
 
 # defined in buildhlp.mk ('extract' can fail, use 'patch' then)
 extract: ${_EXTRACT_COOKIE}

+ 2 - 2
mk/vars.mk

@@ -12,7 +12,7 @@ BUILD_GROUP=		$(shell id -gn)
 ADK_SUFFIX:=		_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}
 
 # some global dirs
-BASE_DIR:=		$(TOPDIR)
+BASE_DIR:=		$(ADK_TOPDIR)
 ifeq ($(ADK_DL_DIR),)
 DL_DIR?=		$(BASE_DIR)/dl
 else
@@ -287,4 +287,4 @@ ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
 endif
 
-include $(TOPDIR)/mk/mirrors.mk
+include $(ADK_TOPDIR)/mk/mirrors.mk

+ 3 - 3
package/.template/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
 
 # always use tab spaces as separator, no spaces
 PKG_NAME:=		@PKG@
@@ -55,7 +55,7 @@ PKG_SITES:=		add download url without package name
 # if downloaded package is not ending with .tar.xz use following
 #DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -74,4 +74,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE
 		$(IDIR_@UPKG@)/usr/bin
 
 # please remove ALL above comments, before commiting
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/.templatelib/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:=		@PKG@
 PKG_VERSION:=		@VER@
@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 # if downloaded package is not ending with .tar.xz use following
 #DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -25,4 +25,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE
 	$(CP) $(WRKINST)/usr/lib/@PKG@*.so* \
 		$(IDIR_@UPKG@)/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/.templateprog/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:=		@PKG@
 PKG_VERSION:=		@VER@
@@ -17,7 +17,7 @@ PKG_SITES:=		add download url without package name
 # if downloaded package is not ending with .tar.xz use following
 #DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -26,4 +26,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
 		$(IDIR_@UPKG@)/usr/bin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/6tunnel/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:=		6tunnel
 PKG_VERSION:=		0.11rc2
@@ -14,7 +14,7 @@ PKG_SITES:=		http://toxygen.net/6tunnel/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -24,4 +24,4 @@ AUTOTOOL_STYLE:=	autoconf
 	$(INSTALL_DIR) $(IDIR_6TUNNEL)/usr/sbin
 	$(INSTALL_BIN) $(WRKBUILD)/6tunnel $(IDIR_6TUNNEL)/usr/sbin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/DirectFB/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:=		DirectFB
 PKG_VERSION:=		1.6.3
@@ -19,7 +19,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -65,4 +65,4 @@ directfb-install:
 	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \
 		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/ImageMagick/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:=		ImageMagick
 PKG_VERSION:=		6.7.6
@@ -36,7 +36,7 @@ PKGSB_DISPLAY:=		libX11
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK},${PKG_OPTS}))
 $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
@@ -79,4 +79,4 @@ display-install:
 	$(INSTALL_DIR) $(IDIR_DISPLAY)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/display $(IDIR_DISPLAY)/usr/bin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 4 - 4
package/Makefile

@@ -3,7 +3,7 @@
 
 # Main makefile for the packages
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
@@ -23,7 +23,7 @@ endif
 
 package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 
-include $(TOPDIR)/package/Depends.mk
+include $(ADK_TOPDIR)/package/Depends.mk
 
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y))
 HOST_COMPILE_PACKAGES:=$(patsubst %,%-host-compile,$(hostpackage-y))
@@ -55,9 +55,9 @@ endif
 
 %-compile:
 	$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "
-	@if test -f $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@); then \
+	@if test -f $(ADK_TOPDIR)/.rebuild.$(patsubst %-compile,%,$@); then \
 		$(MAKE) -C $(patsubst %-compile,%,$@) clean ; \
-		rm $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@) ; \
+		rm $(ADK_TOPDIR)/.rebuild.$(patsubst %-compile,%,$@) ; \
 	fi
 	$(MAKE) -C $(patsubst %-compile,%,$@) fake build-all-pkgs
 	$(CMD_TRACE) " done"

+ 3 - 3
package/SDL_gfx/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:=		SDL_gfx
 PKG_VERSION:=		2.0.22
@@ -18,7 +18,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -28,4 +28,4 @@ libsdl-gfx-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/SDL_ttf/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:=		SDL_ttf
 PKG_VERSION:=		2.0.10
@@ -18,7 +18,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -26,4 +26,4 @@ libsdl-ttf-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/adk-helper/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:=		adk-helper
 PKG_VERSION:=		1.0
@@ -13,8 +13,8 @@ PKG_CFLINE_ADK_HELPER:=	depends on ADK_HOST_ONLY
 
 NO_DISTFILES:=		1
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,ADK_HELPER,adk-helper,${PKG_VERSION}-${PKG_RELEASE}))
 
@@ -29,5 +29,5 @@ adk-helper-hostinstall:
 	${INSTALL_BIN} ${WRKBUILD}/mkcrypt ${STAGING_HOST_DIR}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/dkgetsz ${STAGING_HOST_DIR}/usr/bin
 
-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

+ 3 - 3
package/adk-test-tools/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:=		adk-test-tools
 PKG_VERSION:=		0.1
@@ -12,7 +12,7 @@ PKG_URL:=		http://openadk.org/
 
 NO_DISTFILES:=		1
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ADK_TEST_TOOLS,adk-test-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -25,4 +25,4 @@ adk-test-tools-install:
 	$(INSTALL_BIN) $(WRKBUILD)/{qmp,quit} \
 		$(IDIR_ADK_TEST_TOOLS)/usr/bin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/adkinstall/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:=		adkinstall
 PKG_VERSION:=		2.0
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		mke2fs parted sfdisk dosfstools mksh
 PKG_SYSTEM_DEPENDS:=	mikrotik-rb532 lemote-yeelong
 NO_DISTFILES:=		1
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ADKINSTALL,adkinstall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -25,4 +25,4 @@ do-install:
 	$(INSTALL_DIR) $(IDIR_ADKINSTALL)/sbin
 	$(INSTALL_BIN) ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/aiccu/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:=		aiccu
 PKG_VERSION:=		20070115
@@ -18,7 +18,7 @@ PKG_LIBC_DEPENDS:=	uclibc glibc
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -35,4 +35,4 @@ do-install:
 	$(INSTALL_BIN) $(WRKBUILD)/unix-console/aiccu $(IDIR_AICCU)/usr/sbin/
 	$(INSTALL_DATA) $(WRKBUILD)/doc/aiccu.conf $(IDIR_AICCU)/etc/aiccu.conf
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/aircrack-ng/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:=		aircrack-ng
 PKG_VERSION:=		1.1
@@ -18,7 +18,7 @@ PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -44,4 +44,4 @@ post-install:
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airtun-ng \
 		$(IDIR_AIRCRACK_NG)/usr/sbin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/alix-switch/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:=		alix-switch
 PKG_VERSION:=		1.0
@@ -14,7 +14,7 @@ PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13
 
 NO_DISTFILES:=		1
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALIX_SWITCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -31,4 +31,4 @@ do-install:
 	${INSTALL_BIN} ${WRKBUILD}/alix-switchd ${IDIR_ALIX_SWITCH}/usr/sbin
 	${INSTALL_BIN} ./files/alix-switch ${IDIR_ALIX_SWITCH}/etc
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/alix-temperature/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:=		alix-temperature
 PKG_VERSION:=		1.0
@@ -14,7 +14,7 @@ PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13
 
 NO_DISTFILES:=		1
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ALIX_TEMPERATURE,alix-temperature,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -26,4 +26,4 @@ alix-temperature-install:
 	$(INSTALL_DIR) $(IDIR_ALIX_TEMPERATURE)/usr/sbin
 	$(INSTALL_BIN) ./files/alix-temperature $(IDIR_ALIX_TEMPERATURE)/usr/sbin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/alsa-lib/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:=		alsa-lib
 PKG_VERSION:=		1.0.27.2
@@ -16,8 +16,8 @@ PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -35,5 +35,5 @@ alsa-lib-install:
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa
 
-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

+ 3 - 3
package/alsa-utils/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:=		alsa-utils
 PKG_VERSION:=		1.0.27.2
@@ -21,7 +21,7 @@ PKGFB_WITH_ALSAMIXER:=	ncurses
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -41,4 +41,4 @@ ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
 		${IDIR_ALSA_UTILS}/usr/bin
 endif
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/ant/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:=		ant
 PKG_VERSION:=		1.8.4
@@ -17,8 +17,8 @@ PKG_CFLINE_ANT:=	depends on ADK_HOST_ONLY
 DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
 WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
 
-include $(TOPDIR)/mk/host.mk
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE}))
 
@@ -39,5 +39,5 @@ ant-hostinstall:
 	$(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \
 	$(CP) lib/* $(STAGING_HOST_DIR)/usr/lib
 
-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

+ 3 - 3
package/apr-util/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:=		apr-util
 PKG_VERSION:=		1.4.1
@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -31,4 +31,4 @@ apr-util-install:
 	${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/apr/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:=		apr
 PKG_VERSION:=		1.4.6
@@ -19,7 +19,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_FLAVOURS_APR:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -53,4 +53,4 @@ apr-install:
 	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1
 	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/arpd/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:=		arpd
 PKG_VERSION:=		0.2
@@ -17,7 +17,7 @@ PKG_SITES:=		http://niels.xtdnet.nl/honeyd/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -32,4 +32,4 @@ post-install:
 	${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/arpd ${IDIR_ARPD}/usr/sbin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/arpwatch/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:=		arpwatch
 PKG_VERSION:=		2.1a15
@@ -16,7 +16,7 @@ PKG_SITES:=		ftp://ftp.ee.lbl.gov/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ARPWATCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -33,4 +33,4 @@ do-install:
 	$(INSTALL_BIN) $(WRKBUILD)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/
 	$(INSTALL_DATA) $(WRKBUILD)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/asterisk/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:=		asterisk
 PKG_VERSION:=		12.3.0
@@ -46,7 +46,7 @@ PKGSD_ASTERISK_SOUNDS:=		various soundfiles in GSM format
 PKGSN_ASTERISK_SOUNDS:=		asterisk
 PKGSS_ASTERISK_SOUNDS:=		asterisk-codec-gsm
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_PGSQL},${PKG_SECTION}))
@@ -205,4 +205,4 @@ asterisk-meetme-install:
 	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \
 		${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 7 - 7
package/atftp/Makefile

@@ -1,18 +1,18 @@
 # 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:=		atftp
-PKG_VERSION:=		0.7
-PKG_RELEASE:=		2
+PKG_VERSION:=		0.7.1
+PKG_RELEASE:=		1
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
 PKG_DESCR:=		tftp client
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libreadline libncurses
 PKG_BUILDDEP:=		readline ncurses
-PKG_URL:=		http://freshmeat.net/projects/atftp/
-PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
+PKG_URL:=		http://sourceforge.net/projects/atftp/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=atftp/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
@@ -22,7 +22,7 @@ PKG_SUBPKGS:=		ATFTP ATFTPD
 PKGSD_ATFTPD:=		tftp server
 PKGSS_ATFTPD:=		libreadline libncurses
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION}))
@@ -38,4 +38,4 @@ atftpd-install:
 	$(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin
 	$(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/atk/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:=		atk
 PKG_VERSION:=		2.11.3
@@ -15,7 +15,7 @@ PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/2.11/}
 PKG_LIBNAME:=		libatk
 PKG_OPTS:=		dev
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBATK,libatk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -23,4 +23,4 @@ libatk-install:
 	${INSTALL_DIR} ${IDIR_LIBATK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_LIBATK}/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/autoconf/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:=		autoconf
 PKG_VERSION:=		2.69
@@ -14,8 +14,8 @@ PKG_URL:=		http://www.gnu.org/software/autoconf/
 PKG_SITES:=		${MASTER_SITE_GNU:=autoconf/}
 PKG_OPTS:=		noscripts
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -29,5 +29,5 @@ autoconf-install:
 	${CP} ${WRKINST}/usr/share/autoconf/* \
 		${IDIR_AUTOCONF}/usr/share/autoconf
 
-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

+ 5 - 5
package/automake/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:=		automake
 PKG_VERSION:=		1.14.1
@@ -16,8 +16,8 @@ PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=automake/}
 PKG_OPTS:=		noscripts
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -35,5 +35,5 @@ automake-install:
 	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER} \
 		${IDIR_AUTOMAKE}/usr/share
 
-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

+ 3 - 3
package/autossh/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:=		autossh
 PKG_VERSION:=		1.4b
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.harding.motd.ca/autossh/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tgz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AUTOSSH,autossh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -23,4 +23,4 @@ autossh-install:
 	$(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/avahi/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:=		avahi
 PKG_VERSION:=		0.6.31
@@ -26,7 +26,7 @@ PKGSD_AVAHI_DNSCONFD:=	DNS server from mDNS configuration daemon
 PKGSD_LIBAVAHI:=	DNS-SD over mDNS library
 PKGSC_LIBAVAHI:=	libs/misc
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION}))
@@ -101,4 +101,4 @@ libavahi-install:
 	${CP} ${WRKINST}/usr/lib/libavahi-glib.so* \
 		${IDIR_LIBAVAHI}/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/axtls/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:=		axtls
 PKG_VERSION:=		1.4.9
@@ -22,7 +22,7 @@ PKGSC_LIBAXTLS:=	libs/crypto
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/axTLS
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS},${PKG_OPTS}))
@@ -47,4 +47,4 @@ do-install:
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin
 	${INSTALL_BIN} $(WRKBUILD)/_stage/axhttpd $(IDIR_AXHTTPD)/usr/sbin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/b43-firmware/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:=		b43-firmware
 PKG_VERSION:=		1.0
@@ -13,7 +13,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,B43_FIRMWARE,b43-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -25,4 +25,4 @@ do-install:
 	${INSTALL_DIR} ${IDIR_B43_FIRMWARE}/lib/firmware
 	${CP} ${WRKBUILD}/* ${IDIR_B43_FIRMWARE}/lib/firmware/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 4 - 4
package/base-files/Makefile

@@ -1,8 +1,8 @@
 # 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 $(TOPDIR)/mk/rootfs.mk
+include $(ADK_TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
@@ -13,7 +13,7 @@ PKG_DESCR:=		basic files and scripts
 WRKDIST=		${WRKDIR}/base-files
 NO_DISTFILES:=		1
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},force_etc))
 
@@ -136,4 +136,4 @@ endif
 	printf "nameserver ${ADK_SIMPLE_NETWORK_CONFIG_NS}\n" > ${IDIR_BASE_FILES}/etc/resolv.conf
 endif
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bash/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:=		bash
 PKG_VERSION:=		4.3
@@ -20,7 +20,7 @@ PKGCS_WITH_CURSES:=	libncurses
 PKGCB_WITH_CURSES:=	ncurses
 PKGCD_WITH_TERMCAP:=	use termcap library instead of curses
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BASH,bash,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -39,4 +39,4 @@ bash-install:
 	$(INSTALL_DIR) $(IDIR_BASH)/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/bash $(IDIR_BASH)/bin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/bc/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:=		bc
 PKG_VERSION:=		1.06
@@ -18,8 +18,8 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		BC DC
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -33,5 +33,5 @@ dc-install:
 	${INSTALL_DIR} ${IDIR_DC}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/dc/dc ${IDIR_DC}/usr/bin/dc
 
-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

+ 3 - 3
package/bcm2835-bootloader/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:=		bcm2835-bootloader
 # actually git checkout from 03.06.2014
@@ -15,7 +15,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -29,4 +29,4 @@ do-install:
 	printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
 		${IDIR_BCM2835_BOOTLOADER}/boot/config.txt
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bcm2835-vc/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:=		bcm2835-vc
 # actually git checkout from 03.06.2014
@@ -17,7 +17,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -37,4 +37,4 @@ bcm2835-vc-install:
 	${CP} ${WRKINST}/opt/vc/lib ${STAGING_TARGET_DIR}/opt/vc
 	${CP} ${WRKINST}/opt/vc/include ${STAGING_TARGET_DIR}/opt/vc
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bdftopcf/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:=		bdftopcf
 PKG_VERSION:=		1.0.3
@@ -14,7 +14,7 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BDFTOPCF,bdftopcf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -23,4 +23,4 @@ bdftopcf-install:
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/bdftopcf \
 		$(IDIR_BDFTOPCF)/usr/bin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/beecrypt/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:=		beecrypt
 PKG_VERSION:=		4.2.1
@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -29,4 +29,4 @@ beecrypt-install:
 	$(CP) $(WRKINST)/usr/lib/libbeecrypt*.so* \
 		$(IDIR_BEECRYPT)/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bigreqsproto/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:=		bigreqsproto
 PKG_VERSION:=		1.1.2
@@ -14,8 +14,8 @@ PKG_OPTS:=		dev devonly
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bind/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:=		bind
 PKG_VERSION:=		9.9.5
@@ -43,7 +43,7 @@ PKGSC_LIBBIND:=		libs/net
 PKG_FLAVOURS_BIND_SERVER:=	WITH_IPV6
 PKGFD_WITH_IPV6:=		enable IPv6 support
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,BIND_NSUPDATE,bind-nsupdate,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_NSUPDATE},${PKGSD_BIND_NSUPDATE},${PKGSC_BIND_NSUPDATE}))
@@ -117,4 +117,4 @@ libbind-install:
 	${CP} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib
 	${CP} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 4 - 4
package/binutils/Makefile

@@ -1,8 +1,8 @@
 # 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 ${TOPDIR}/toolchain/binutils/Makefile.inc
+include ${ADK_TOPDIR}/rules.mk
+include ${ADK_TOPDIR}/toolchain/binutils/Makefile.inc
 
 PKG_NAME:=		binutils
 PKG_DESCR:=		binary utilities (nm, objdump, as, ..)
@@ -17,7 +17,7 @@ PKGSC_LIBBFD:=		libs/misc
 
 PKG_HOST_DEPENDS:=      !cygwin
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBFD},${PKGSD_LIBBFD},${PKGSC_LIBBFD},${PKG_OPTS}))
@@ -51,4 +51,4 @@ binutils-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{objcopy,ranlib,readelf,objdump} \
 		 ${IDIR_BINUTILS}/usr/bin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/bison/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:=		bison
 PKG_VERSION:=		3.0.2
@@ -14,8 +14,8 @@ HOST_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -29,5 +29,5 @@ bison-install:
 	${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison
 	$(CP) ./files/yacc ${IDIR_BISON}/usr/bin
 
-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

+ 3 - 3
package/bitlbee/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:=		bitlbee
 PKG_VERSION:=		3.0.1
@@ -17,7 +17,7 @@ PKG_SITES:=		http://get.bitlbee.org/src/
 PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -48,4 +48,4 @@ bitlbee-install:
 	${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bkeymaps/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:=		bkeymaps
 PKG_VERSION:=		1.13
@@ -16,7 +16,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_DFLT_BKEYMAPS:=	y if ADK_TARGET_WITH_INPUT
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BKEYMAPS,bkeymaps,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -33,4 +33,4 @@ do-install:
 	$(INSTALL_DATA) $(WRKBUILD)/bkeymaps/$(KBD_DIR)/$(KBD_LAYOUT).bmap \
 		$(IDIR_BKEYMAPS)/usr/share/keymaps/keymap.bmap );
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bluez-firmware/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:=		bluez-firmware
 PKG_VERSION:=		1.2
@@ -15,7 +15,7 @@ PKG_SITES:=		http://bluez.sourceforge.net/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -26,4 +26,4 @@ post-install:
 	${CP} ${WRKINST}/lib/firmware/BCM* \
 		${IDIR_BLUEZ_FIRMWARE}/lib/firmware
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bluez/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:=		bluez
 PKG_VERSION:=		5.19
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -48,4 +48,4 @@ bluez-install:
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bogofilter/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:=		bogofilter
 PKG_VERSION:=		1.2.4
@@ -17,7 +17,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -36,4 +36,4 @@ bogofilter-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/bogofilter \
 		 ${IDIR_BOGOFILTER}/usr/bin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 4 - 4
package/boost/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:=		boost
 PKG_VERSION:=		1.55.0
@@ -38,11 +38,11 @@ PKGFD_TEST:=		with test
 PKGFD_THREAD:=		with thread
 PKGFD_WAVE:=		with wave
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-include ${TOPDIR}/mk/python.mk
+include ${ADK_TOPDIR}/mk/python.mk
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -149,4 +149,4 @@ boost-install:
 	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/boot-wrapper-aarch64/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:=		boot-wrapper-aarch64
 PKG_VERSION:=		0.1
@@ -15,7 +15,7 @@ PKG_SYSTEM_DEPENDS:=	arm-fm
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BOOT_WRAPPER_AARCH64,boot-wrapper-aarch64,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -25,4 +25,4 @@ CONFIGURE_ARGS+=	--with-kernel-dir=${LINUX_DIR}
 boot-wrapper-aarch64-install:
 	${CP} ${WRKBUILD}/linux-system.axf ${LINUX_DIR}
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/brcm-bluetooth/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:=		brcm-bluetooth
 PKG_VERSION:=		1.0
@@ -12,7 +12,7 @@ PKG_SECTION:=		sys/firmware
 
 NO_DISTFILES:=		1
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BRCM_BLUETOOTH,brcm-bluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -31,4 +31,4 @@ do-install:
 	${INSTALL_BIN} ${WRKBUILD}/brcm_patchram \
 		${IDIR_BRCM_BLUETOOTH}/sbin/brcm_patchram
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/brcmfmac-firmware/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:=		brcmfmac-firmware
 PKG_VERSION:=		1.0
@@ -12,7 +12,7 @@ PKG_SECTION:=		sys/firmware
 
 NO_DISTFILES:=		1
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BRCMFMAC_FIRMWARE,brcmfmac-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -24,4 +24,4 @@ do-install:
 	${INSTALL_DIR} ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/brcm
 	${CP} ${WRKBUILD}/* ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/brcm
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bridge-utils/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:=		bridge-utils
 PKG_VERSION:=		1.5
@@ -15,7 +15,7 @@ PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -27,4 +27,4 @@ bridge-utils-install:
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/brctl \
 		${IDIR_BRIDGE_UTILS}/usr/sbin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/busybox/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:=		busybox
 PKG_VERSION:=		1.22.1
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.busybox.net/downloads/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BUSYBOX,busybox,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -32,10 +32,10 @@ BB_MAKE_FLAGS:=		V=1 \
 
 do-configure:
 	# get all symbols from top level config
-	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
+	grep BUSYBOX_ $(ADK_TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${WRKBUILD}/.config
 	# remove all disabled symbols
-	for i in $$(grep "BUSYBOX_DISABLE" $(TOPDIR)/.config);do \
+	for i in $$(grep "BUSYBOX_DISABLE" $(ADK_TOPDIR)/.config);do \
 		test -s "$$i" || continue; \
 		grep -v $${i#BUSYBOX_DISABLE} ${WRKBUILD}/.config > \
 		${WRKBUILD}/.config.tmp; \
@@ -74,4 +74,4 @@ ifneq ($(strip ${ADK_PACKAGE_CFGFS}),)
 	cd ${IDIR_BUSYBOX}/sbin && rm -f halt poweroff reboot
 endif
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/bwm/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:=		bwm
 PKG_VERSION:=		1.1.0
@@ -14,7 +14,7 @@ PKG_SITES:=		http://ftp.debian.org/debian/pool/main/b/bwm/
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BWM,bwm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -29,4 +29,4 @@ do-install:
 	${INSTALL_DIR} ${IDIR_BWM}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/bwm ${IDIR_BWM}/usr/bin/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/bzip2/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:=		bzip2
 PKG_VERSION:=		1.0.6
@@ -23,8 +23,8 @@ PKG_SUBPKGS:=		BZIP2 LIBBZ2
 PKGSD_LIBBZ2:=		bzip2 compression library
 PKGSC_LIBBZ2:=		libs/misc
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -67,5 +67,5 @@ bzip2-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/$(BIN_FILE) ${IDIR_BZIP2}/usr/bin/bzip2
 
-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

+ 4 - 4
package/bzr/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:=		bzr
 PKG_VERSION:=		2.6.0
@@ -18,7 +18,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_HOST_DEPENDS:=	!darwin
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BZR,bzr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -26,7 +26,7 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-include $(TOPDIR)/mk/python.mk
+include $(ADK_TOPDIR)/mk/python.mk
 
 do-build:
 	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix=$(WRKINST)/usr build_ext --allow-python-fallback
@@ -38,4 +38,4 @@ do-install:
 	$(INSTALL_DIR) $(IDIR_BZR)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/bzr $(IDIR_BZR)/usr/bin
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/ca-certificates/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:=		ca-certificates
 PKG_VERSION:=		20090814
@@ -18,7 +18,7 @@ DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
 PKG_FLAVOURS_CA_CERTS:=	SMALL
 PKGFD_SMALL:=		minimal set of CA certificates
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CA_CERTIFICATES,ca-certificates,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},force_etc))
 
@@ -38,4 +38,4 @@ else
 	-DESTDIR=${IDIR_CA_CERTIFICATES} ${BASH} ./extra/update-ca-certificates
 endif
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/cairo/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:=		cairo
 PKG_VERSION:=		1.12.16
@@ -18,8 +18,8 @@ PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 PKG_OPTS:=		dev
 
-include ${TOPDIR}/mk/host.mk
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -52,5 +52,5 @@ cairo-install:
 	${CP} ${WRKINST}/usr/lib/libcairo*.so* ${IDIR_CAIRO}/usr/lib
 	${CP} ${WRKINST}/usr/lib/cairo/*.so* ${IDIR_CAIRO}/usr/lib/cairo
 
-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

+ 5 - 5
package/ccache/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:=		ccache
 PKG_VERSION:=		3.1.9
@@ -13,10 +13,10 @@ PKG_SITES:=		http://samba.org/ftp/ccache/
 
 PKG_CFLINE_CCACHE:=	depends on ADK_HOST_ONLY
 
-include $(TOPDIR)/mk/host.mk
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,CCACHE,ccache,$(PKG_VERSION)-${PKG_RELEASE}))
 
-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

+ 3 - 3
package/ccid/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:=		ccid
 PKG_VERSION:=		1.4.4
@@ -15,7 +15,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CCID,ccid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -30,4 +30,4 @@ ccid-install:
 	$(CP) $(WRKINST)/usr/lib/pcsc/drivers/* \
 		$(IDIR_CCID)/usr/lib/pcsc/drivers
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 5 - 5
package/cdrtools/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:=		cdrtools
 PKG_VERSION:=		3.01
@@ -14,8 +14,8 @@ PKG_SITES:=		ftp://ftp.berlios.de/pub/cdrecord/
 
 PKG_CFLINE_CDRTOOLS:=	depends on ADK_HOST_ONLY
 
-include $(TOPDIR)/mk/host.mk
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE}))
 
@@ -30,5 +30,5 @@ cdrtools-hostinstall:
 	$(INSTALL_BIN) $(WRKBUILD)/mkisofs/OBJ/*/mkisofs \
 		$(STAGING_HOST_DIR)/usr/bin
 
-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

+ 3 - 3
package/cfgfs/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:=		cfgfs
 PKG_VERSION:=		1.0.10
@@ -21,7 +21,7 @@ PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_T
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -37,4 +37,4 @@ do-install:
 		ln cfgfs $$tgt; \
 	done
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/cgilib/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:=		cgilib
 PKG_VERSION:=		0.7
@@ -15,7 +15,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -28,4 +28,4 @@ cgilib-install:
 	${INSTALL_DIR} ${IDIR_CGILIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcgi.so* ${IDIR_CGILIB}/usr/lib/
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/check/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:=		check
 PKG_VERSION:=		0.9.12
@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCHECK,libcheck,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
@@ -25,4 +25,4 @@ libcheck-install:
 	$(CP) $(WRKINST)/usr/lib/libcheck*.so* \
 		$(IDIR_LIBCHECK)/usr/lib
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/cherokee/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:=		cherokee
 PKG_VERSION:=		1.2.101
@@ -14,7 +14,7 @@ PKG_SITES:=		http://www.cherokee-project.de/mirrors/cherokee/1.2/${PKG_VERSION}/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk