- split VERSION into parts

- add some filesystem operation wrapper variables for use in the makefiles and
  pull them in early in the toplevel makefile
- use the cross-toolchain for "make sizes"

diff --git a/Makefile b/Makefile
index 63a2c1327a9519c69927b487bd1e4d8da6140cb2..9c3ed40a81af6d349c976864e6680e7709e45a32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,11 @@ else
   KBUILD_OUTPUT := $(top_builddir)
 endif
 
+ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
+# pull in OS specific commands like cp, mkdir, etc. early
+-include $(top_srcdir)/Rules.mak
+endif
+
 # All object directories.
 OBJ_DIRS := $(DIRS)
 all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include)
@@ -252,7 +257,7 @@ sizes:
        -rm -f busybox
        $(MAKE) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) \
                -f $(top_srcdir)/Makefile STRIPCMD=/bin/true
-       nm --size-sort busybox
+       $(NM) --size-sort busybox
 
 # Documentation Targets
 doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html

diff --git a/Rules.mak b/Rules.mak
index 1e519fbf1b8ef8bab8ab662278559417df4ceb42..6c447264408b03414535256068622e83bb264fa2 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -19,7 +19,11 @@
 
 #--------------------------------------------------------
 PROG      := busybox
-VERSION   := 1.1.0-pre1
+MAJOR_VERSION   :=1
+MINOR_VERSION   :=1
+SUBLEVEL_VERSION:=0
+EXTRAVERSION    :=-pre1
+VERSION   :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 
 
@@ -43,6 +47,15 @@ NM             = $(CROSS)nm
 STRIP          = $(CROSS)strip
 CPP            = $(CC) -E
 # MAKEFILES      = $(top_builddir)/.config
+RM             = rm
+RM_F           = $(RM) -f
+LN             = ln
+LN_S           = $(LN) -s
+MKDIR          = mkdir
+MKDIR_P        = $(MKDIR) -p
+MV             = mv
+CP             = cp
+
 
 # What OS are you compiling busybox for?  This allows you to include
 # OS specific things, syscall overrides, etc.