Changeset 916 in MondoRescue for branches/stable/tools

Timestamp:

Nov 2, 2006, 7:47:32 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fixes to support CentOS build
Fixes for build errors reporetd by Andy Wright (mondo_at_eltofts.homelinux.com)

Location:

branches/stable/tools

Files:

• distro-env (modified) (3 diffs)
• livwww (modified) (3 diffs)

branches/stable/tools/distro-env

@@ -26 +26 @@
         elif grep -q Fedora /etc/redhat-release ; then
             export ddir="fedora"
+            export dver=`awk '{print $4}' /etc/redhat-release`
+        elif grep -q CentOS /etc/redhat-release ; then
+            export ddir="centos"
             export dver=`awk '{print $4}' /etc/redhat-release`
         else
@@ -81 +84 @@
     dtype="rpm"
     suf=".${ddir}${dver}"
-elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
+elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" -o $ddir = "centos" ]; then
     dfam="redhat"
     dtype="rpm"
@@ -87 +90 @@
     if [ $ddir = "fedora" ]; then
         suf=".fc${dver1}"
+    elif [ $ddir = "centos" ]; then
+        suf=".centos${dver1}"
     elif [ $ddir = "redhat" ]; then
         suf=".rh${dver1}"

branches/stable/tools/livwww

@@ -48 +48 @@
 if [ $force -eq 1 ]; then
     echo "Purging $LOCALDIR"
-    rm -rf $LOCALDIR
+    rm -rf $LOCALDIR/* $LOCALDIR/.??*
 fi
 
@@ -55 +55 @@
 if [ $force -eq 1 ]; then
     echo "Purging $LOCALDOC"
-    rm -rf $LOCALDOC
+    rm -rf $LOCALDOC/* $LOCALDOC/.??*
 fi
 
@@ -69 +69 @@
     make -f Makefile.howto
     make -f Makefile.man
-    mv $LOCALDOC $LOCALDIR/docs
+    mkdir -p $LOCALDIR/docs
+    mv $LOCALDOC/* $LOCALDIR/docs
     #
     # Man pages corrections