Making note of my changes

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 4215b291bf1dea3467a802d847f122bff957afd2..554dd00f55453fdc750587e2fca5d9d3b7e2499b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,12 @@
 
 
 PROG=busybox
-VERSION=0.40
+VERSION=0.42
 BUILDTIME=$(shell date "+%Y%m%d-%H%M")
 
 # Comment out the following to make a debuggable build
 # Leave this off for production use.
-DODEBUG=true
+DODEBUG=false
 # If you want a static binary, turn this on.  I can't think
 # of many situations where anybody would ever want it static, 
 # but...
@@ -36,7 +36,7 @@ GCCMINVERSION=$(shell $(CC) --version | sed -n "s/^[^\.]*\.\([^\.]*\)[\.].*/\1/p
 
 GCCSUPPORTSOPTSIZE=$(shell \
 if ( test $(GCCMAJVERSION) -eq 2 ) ; then \
-    if ( test $(GCCMINVERSION) -ge 91 ) ; then \
+    if ( test $(GCCMINVERSION) -ge 66 ) ; then \
        echo "true"; \
     else \
        echo "false"; \
@@ -80,12 +80,8 @@ 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}
+    CFLAGS += -DINIT_SCRIPT=${BB_INIT_SCRIPT}
 endif
 
 all: busybox busybox.links
@@ -112,6 +108,6 @@ install: busybox busybox.links
 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)) 
+       (cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/scripts/CVS busybox-$(VERSION)/docs/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION))