From 126777bc019a54afb4ec51299f2cf9d2841698aa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 25 Apr 2007 12:26:16 +0000
Subject: re-sync after the big svn loss

---
 Makefile.config | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'Makefile.config')

diff --git a/Makefile.config b/Makefile.config
index a688c5b9c..8923de49b 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,17 +1,7 @@
-ROOTDEST = /export
-MISC_DEST = $(ROOTDEST)/misc
-GENERIC_INSTALL_DEST = $(ROOTDEST)/install
-EXTRA_INSTALL_DEST = $(GENERIC_INSTALL_DEST)/extra
-IMAGES_DEST = $(GENERIC_INSTALL_DEST)/images
-STAGE2_DEST = $(GENERIC_INSTALL_DEST)/stage2
-STAGE2_LIVE = $(STAGE2_DEST)/live
 
-MAIN_RPMS_DIR = $(ROOTDEST)/media/main
-MEDIA_INFO_DEST = $(ROOTDEST)/media/media_info
-
-_DISTRIB_NAME = Mandriva Linux
+_DISTRIB_NAME := $(shell sed -n '/^.*distribution=\([^,]*\),.*/s//\1/p' /etc/product.id)
 DISTRIB_NAME = "$(_DISTRIB_NAME)"
-DISTRIB_VERSION = 2006
+DISTRIB_VERSION = $(shell sed -n '/^.*version=\([^,]*\),.*/s//\1/p' /etc/product.id)
 DISTRIB_DESCR = "$(_DISTRIB_NAME) release $(DISTRIB_VERSION)"
 
 
@@ -19,6 +9,8 @@ DISTRIB_DESCR = "$(_DISTRIB_NAME) release $(DISTRIB_VERSION)"
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
+PKG_ARCH := $(patsubst i386,i586,$(ARCH))
+
 ifeq (x86_64, $(ARCH))
 LIB = lib64
 else
-- 
cgit v1.2.1