summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-04-25 14:30:07 +0000
committerOlivier Blin <oblin@mandriva.com>2007-04-25 14:30:07 +0000
commit61fa3ec0e7a84008e0bb1b3352b339bf878fc946 (patch)
tree3a39756bb8e592fc3e58fbccf38c66818336d5cd
parent2e3fb166f558e03b19507981444b7cf568f3c590 (diff)
downloaddrakx-61fa3ec0e7a84008e0bb1b3352b339bf878fc946.tar
drakx-61fa3ec0e7a84008e0bb1b3352b339bf878fc946.tar.gz
drakx-61fa3ec0e7a84008e0bb1b3352b339bf878fc946.tar.bz2
drakx-61fa3ec0e7a84008e0bb1b3352b339bf878fc946.tar.xz
drakx-61fa3ec0e7a84008e0bb1b3352b339bf878fc946.zip
pass DISTRIB_TYPE when building stage1 (useful to know which mirro list to retrieve)
-rw-r--r--Makefile.config1
-rw-r--r--mdk-stage1/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.config b/Makefile.config
index 8923de49b..b661fff10 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -2,6 +2,7 @@
_DISTRIB_NAME := $(shell sed -n '/^.*distribution=\([^,]*\),.*/s//\1/p' /etc/product.id)
DISTRIB_NAME = "$(_DISTRIB_NAME)"
DISTRIB_VERSION = $(shell sed -n '/^.*version=\([^,]*\),.*/s//\1/p' /etc/product.id)
+DISTRIB_TYPE = $(shell sed -n '/^.*type=\([^,]*\),.*/s//\1/p' /etc/product.id)
DISTRIB_DESCR = "$(_DISTRIB_NAME) release $(DISTRIB_VERSION)"
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index eebeb3e7a..34605826b 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -53,7 +53,7 @@ ifeq (i386, $(ARCH))
ARCHDIR=i586
endif
-DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64 -DARCH=\"$(ARCHDIR)\" -DCONFIG_USE_ZLIB
+DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_TYPE=\"$(DISTRIB_TYPE)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64 -DARCH=\"$(ARCHDIR)\" -DCONFIG_USE_ZLIB
COMPILE = $(CC) $(DEFS) $(CFLAGS)