From 0584a406ed7215cc70fa96b6c53771dd47addff8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 15 Jan 2005 17:44:05 +0000
Subject: factorize the distrib version

---
 mdk-stage1/Makefile        |  4 +---
 mdk-stage1/config-stage1.h |  6 ++++--
 mdk-stage1/stage1.c        | 10 ++--------
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'mdk-stage1')

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index d20aecf71..ae1713aa0 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -40,14 +40,12 @@
  #*****************************************************************************
 
 
-VERSION = 10.1
-
 top_dir = .
 
 include $(top_dir)/Makefile.common
 
 
-DEFS = -DVERSION=\"$(VERSION)\" -DSPAWN_SHELL $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64
+DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" -DSPAWN_SHELL $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64
 
 COMPILE = $(CC) $(DEFS) $(CFLAGS)
 
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index 662ad4fb5..3dbbf53b8 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -34,7 +34,11 @@
 #ifdef MANDRAKE_MOVE
 
 #define MEM_LIMIT_MOVE 120
+
+#undef DISTRIB_NAME
 #define DISTRIB_NAME "Mandrakemove"
+#undef DISTRIB_DESCR
+#define DISTRIB_DESCR DISTRIB_NAME
 
 #define IMAGE_LOCATION_DIR SLASH_LOCATION "/"
 #define IMAGE_LOCATION_REL "cdrom"
@@ -51,8 +55,6 @@
 
 #else
 
-#define DISTRIB_NAME "Mandrakelinux"
-
 #define LIVE_LOCATION_REL "install/stage2/live/"
 #define CLP_LOCATION_REL  "install/stage2/"
 #define CLP_STAGE2_NAME "mdkinst.clp"
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index d22fc7cd1..820c42273 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -604,19 +604,13 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
 	spawn_interactive();
 
 	open_log();
-	log_message("welcome to the " DISTRIB_NAME " install (mdk-stage1, version " VERSION " built " __DATE__ " " __TIME__")");
+	log_message("welcome to the " DISTRIB_NAME " install (mdk-stage1, version " DISTRIB_VERSION " built " __DATE__ " " __TIME__")");
 	process_cmdline();
 #ifdef SPAWN_SHELL
 	spawn_shell();
 #endif
 	init_modules_insmoding();
-	init_frontend("Welcome to " DISTRIB_NAME
-#ifdef MANDRAKE_MOVE
-                      ", "
-#else
-                      " (" VERSION ") "
-#endif
-                      __DATE__ " " __TIME__);
+	init_frontend("Welcome to " DISTRIB_DESCR ", " __DATE__ " " __TIME__);
 
 	if (IS_EXPERT)
 		expert_third_party_modules();
-- 
cgit v1.2.1