From 90f603e2be40d996c421ae8e95464e38911eabaf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Jun 2014 07:41:41 +0200 Subject: s/TOPDIR/ADK_TOPDIR/ to avoid namespace collisions in some packages, rename TOPDIR. Sorry you need to make cleandir && make prereq && make --- mk/image.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mk/image.mk') diff --git a/mk/image.mk b/mk/image.mk index 7fc46f6b2..cfd50f475 100644 --- a/mk/image.mk +++ b/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),) -- cgit v1.2.3