valgrind: workaround for segmentation fault on PowerPC

[buildroot-mgba.git] / Makefile

diff --git a/Makefile b/Makefile
index 24f0cb2d0668965383596973c03bf6d29c2ee393..a20d3e2a8969f1ca66ed5fb518d0efd8a3c81b5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.08-rc1
+export BR2_VERSION:=2011.11-git
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
@@ -32,12 +32,12 @@ export BR2_VERSION:=2011.08-rc1
 # absolute path
 TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
-CONFIG=package/config
+CONFIG=support/kconfig
 DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
 # Need to export it, so it can be got from environment in children (eg. mconf)
-export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion)
+export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
 
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
        defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \
@@ -193,7 +193,7 @@ unexport CFLAGS
 unexport CXXFLAGS
 unexport GREP_OPTIONS
 
-GNU_HOST_NAME:=$(shell package/gnuconfig/config.guess)
+GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 
 #############################################################
 #
@@ -425,7 +425,7 @@ erase-fakeroots:
 
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
-       ( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
+       ( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
 else
        rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal
        find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
@@ -607,7 +607,7 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 # output directory.
 outputmakefile:
 ifeq ($(NEED_WRAPPER),y)
-       $(Q)$(TOPDIR)/scripts/mkmakefile $(TOPDIR) $(O)
+       $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif
 
 clean:
@@ -652,12 +652,17 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 ifeq ($(BR2_LINUX_KERNEL),y)
        @echo '  linux-menuconfig       - Run Linux kernel menuconfig'
+       @echo '  linux-savedefconfig    - Run Linux kernel savedefconfig'
 endif
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
        @echo '  uclibc-menuconfig      - Run uClibc menuconfig'
 endif
 ifeq ($(BR2_TOOLCHAIN_CTNG),y)
        @echo '  ctng-menuconfig        - Run crosstool-NG menuconfig'
+endif
+ifeq ($(BR2_TARGET_BAREBOX),y)
+       @echo '  barebox-menuconfig     - Run barebox menuconfig'
+       @echo '  barebox-savedefconfig  - Run barebox savedefconfig'
 endif
        @echo
        @echo 'Miscellaneous:'