implemented numeric sort (sort -g)

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index c715c0bd65fd98b1220ad8bf24056dbddd6808f6..73aa2fc909b6a0c7e4ab64d367fb2088588136a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 
 
 PROG=busybox
-VERSION=0.36
+VERSION=0.40
 BUILDTIME=$(shell date "+%Y%m%d-%H%M")
 
 # Comment out the following to make a debuggable build
@@ -31,8 +31,8 @@ DOSTATIC=false
 #This will choke on a non-debian system
 ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
 
-GCCMAJVERSION=`$(CC) --version | sed -n "s/^\([0-9]\)\.\([0-9].*\)[\.].*/\1/p"`
-GCCMINVERSION=`$(CC) --version | sed -n "s/^\([0-9]\)\.\([0-9].*\)[\.].*/\2/p"`
+GCCMAJVERSION=$(shell $(CC) --version | sed -n "s/^\([^\.]*\).*/\1/p" )
+GCCMINVERSION=$(shell $(CC) --version | sed -n "s/^[^\.]*\.\([^\.]*\)[\.].*/\1/p" )
 
 GCCSUPPORTSOPTSIZE=$(shell \
 if ( test $(GCCMAJVERSION) -eq 2 ) ; then \
@@ -73,13 +73,20 @@ else
 endif
 
 ifndef $(PREFIX)
-    PREFIX=`pwd`/busybox_install
+    PREFIX=`pwd`/_install
 endif
 
 LIBRARIES=
 OBJECTS=$(shell ./busybox.sh)
 CFLAGS+= -DBB_VER='"$(VERSION)"'
 CFLAGS+= -DBB_BT='"$(BUILDTIME)"'
+ifdef BB_INIT_RC_EXIT_CMD
+    CFLAGS += -DBB_INIT_CMD_IF_RC_SCRIPT_EXITS=${BB_INIT_RC_EXIT_CMD}
+endif
+
+ifdef BB_INIT_SCRIPT
+    CFLAGS += -DBB_INIT_SCRIPT=${BB_INIT_SCRIPT}
+endif
 
 all: busybox busybox.links
 
@@ -89,27 +96,22 @@ busybox: $(OBJECTS)
 
 busybox.links:
        - ./busybox.mkll | sort >$@
-       
+
 clean:
        - rm -f $(PROG) busybox.links *~ *.o core 
-       - rm -rf busybox_install
+       - rm -rf _install
 
 distclean: clean
        - rm -f $(PROG)
 
-force:
-
 $(OBJECTS):  busybox.def.h internal.h Makefile
 
 install: busybox busybox.links
        ./install.sh $(PREFIX)
 
-whichversion:
-       @echo $(VERSION)
-
-
 dist: release
 
 release: distclean
        (cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)) 
 
+