eliminate DOSTATIC, DODEBUG, etc and name them sensibly

7 files changed, 23 insertions, 23 deletions

diff --git a/debian/config-deb b/debian/config-deb
index 862e06f..4d63e69 100644
--- a/debian/config-deb
+++ b/debian/config-deb
@@ -20,8 +20,8 @@ CONFIG_FEATURE_INSTALLER=y
 #
 # Build Options
 #
-# DOSTATIC is not set
-DOLFS=y
+# CONFIG_STATIC is not set
+CONFIG_LFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -362,4 +362,4 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 #
 # Debugging Options
 #
-# DODEBUG is not set
+# CONFIG_DEBUG is not set
diff --git a/debian/config-net-udeb b/debian/config-net-udeb
index 0a7990c..b9426a2 100644
--- a/debian/config-net-udeb
+++ b/debian/config-net-udeb
@@ -20,8 +20,8 @@ CONFIG_FEATURE_DEVPTS=y
 #
 # Build Options
 #
-# DOSTATIC is not set
-# DOLFS is not set
+# CONFIG_STATIC is not set
+# CONFIG_LFS is not set
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -366,4 +366,4 @@ CONFIG_UMOUNT=y
 #
 # Debugging Options
 #
-# DODEBUG is not set
+# CONFIG_DEBUG is not set
diff --git a/debian/config-net-udeb-i386 b/debian/config-net-udeb-i386
index d82fabb..1335bac 100644
--- a/debian/config-net-udeb-i386
+++ b/debian/config-net-udeb-i386
@@ -20,8 +20,8 @@ CONFIG_FEATURE_DEVPTS=y
 #
 # Build Options
 #
-# DOSTATIC is not set
-DOLFS=y
+# CONFIG_STATIC is not set
+CONFIG_LFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -371,4 +371,4 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 #
 # Debugging Options
 #
-# DODEBUG is not set
+# CONFIG_DEBUG is not set
diff --git a/debian/config-static b/debian/config-static
index 082c46d..454bbf2 100644
--- a/debian/config-static
+++ b/debian/config-static
@@ -20,8 +20,8 @@ CONFIG_FEATURE_DEVPTS=y
 #
 # Build Options
 #
-DOSTATIC=y
-DOLFS=y
+CONFIG_STATIC=y
+CONFIG_LFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -486,4 +486,4 @@ CONFIG_FEATURE_MTAB_FILENAME="/etc/mtab"
 #
 # Debugging Options
 #
-# DODEBUG is not set
+# CONFIG_DEBUG is not set
diff --git a/debian/config-udeb b/debian/config-udeb
index be119aa..b78c6a5 100644
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -20,8 +20,8 @@ CONFIG_FEATURE_DEVPTS=y
 #
 # Build Options
 #
-# DOSTATIC is not set
-DOLFS=y
+# CONFIG_STATIC is not set
+CONFIG_LFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -398,4 +398,4 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 #
 # Debugging Options
 #
-# DODEBUG is not set
+# CONFIG_DEBUG is not set
diff --git a/debian/config-udeb-i386 b/debian/config-udeb-i386
index e12e8c1..72fc4c3 100644
--- a/debian/config-udeb-i386
+++ b/debian/config-udeb-i386
@@ -20,8 +20,8 @@ CONFIG_FEATURE_DEVPTS=y
 #
 # Build Options
 #
-# DOSTATIC is not set
-DOLFS=y
+# CONFIG_STATIC is not set
+CONFIG_LFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -410,4 +410,4 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 #
 # Debugging Options
 #
-# DODEBUG is not set
+# CONFIG_DEBUG is not set
diff --git a/debian/rules b/debian/rules
index 47605fa..82bf9f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	DODEBUG = true
+	CONFIG_DEBUG = true
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
@@ -39,7 +39,7 @@ else
 endif
 
 	$(MAKE) dep
-	$(MAKE) DODEBUG=$(DODEBUG)
+	$(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
 
 	install -d install-$(PACKAGE_PREFIX)/bin
 	install busybox install-$(PACKAGE_PREFIX)/bin/busybox
@@ -57,7 +57,7 @@ else
 endif
 
 	$(MAKE) dep
-	$(MAKE) DODEBUG=$(DODEBUG)
+	$(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
 
 	install -d install-$(PACKAGE_PREFIX)-static/bin
 	install busybox install-$(PACKAGE_PREFIX)-static/bin/busybox
@@ -75,7 +75,7 @@ else
 endif
 
 	$(MAKE) dep
-	$(MAKE) DODEBUG=$(DODEBUG)
+	$(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
 
 	$(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-udeb install
 
@@ -89,7 +89,7 @@ ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),)
 	cp ./debian/config-net-udeb-$(DEB_HOST_ARCH) .config
 
 	$(MAKE) dep
-	$(MAKE) DODEBUG=$(DODEBUG)
+	$(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
 
 	$(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-net-udeb install
 endif