Changeset 885 in MondoRescue for branches/2.2.0/tools/distro-env

Timestamp:

Oct 8, 2006, 12:11:38 PM (19 years ago)

Author:

Bruno Cornec

Message:

merge -r881:884 $SVN_M/branches/stable

File:

• branches/2.2.0/tools/distro-env (modified) (5 diffs)

branches/2.2.0/tools/distro-env

@@ -7 +7 @@
 # Input parameters : $ddir (distro name) and $dver (distro version)
 # If they do not exist then deduce from current distro
-# Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) BUILDDIR (dir to build packages) 
+# Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) TOPBUILDDIR (dir to build packages) 
 
 #
@@ -68 +68 @@
     dtype="deb"
     suf=".${dfam}${dver}"
-    BUILDDIR=${TOPDIR}/debian 
 elif [ $ddir = "gentoo" ]; then
     dfam="gentoo"
@@ -74 +73 @@
     dver1=`echo ${dver} | sed "s/\.//"`
     suf=".${ddir}${dver1}"
-    BUILDDIR=${TOPDIR}/ebuild 
 elif [ $ddir = "slackware" ]; then
     dfam="slack"
     dtype="tgz"
     suf=".${dfam}${dver}"
-    BUILDDIR=${TOPDIR}/slack 
 elif [ $ddir = "sles" -o $ddir = "suse" ]; then
     dfam="suse"
     dtype="rpm"
     suf=".${ddir}${dver}"
-    BUILDDIR=${TOPDIR}/SPECS 
 elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
     dfam="redhat"
@@ -96 +92 @@
         suf=".rhel${dver1}"
     fi
-    BUILDDIR=${TOPDIR}/SPECS 
-elif [ $ddir = "mandrake" -o $ddir = "mandriva" ]; then
+elif [ $ddir = "mandrake" ]; then
     dfam="mandriva"
     dtype="rpm"
     suf=".`echo $dver | sed 's/\.//'`mdk"
-    BUILDDIR=${TOPDIR}/SPECS 
+elif [ $ddir = "mandriva" ]; then
+    dfam="mandriva"
+    dtype="rpm"
+    suf=".`echo $dver | sed 's/\.//'`mdv"
 else
     dfam="unknown"
     dtype="unknown"
-    BUILDDIR=${TOPDIR}/SPECS 
     suf="unknown"
 fi
@@ -111 +108 @@
 export dfam
 export dtype
-export BUILDDIR
 export suf