several changes

diff --git a/distr/Action b/distr/Action
index 0d076f6..1cbc544 100644 (file)
--- a/distr/Action
+++ b/distr/Action
@@ -1,23 +1,3 @@
 name "EM tables"
 dir etc
 end
-name "Installation manual"
-dir doc
-end
-name "Pascal bootstrap files"
-dir lang/pc/pem
-end
-name "LLgen bootstrap files"
-dir util/LLgen
-end
-name "ego share pop_push file"
-dir util/ego/share
-end
-name "h/local.h"
-dir first
-action "cp local.h.src ../h/local.h"
-end
-name "h/em_path.h"
-dir first
-action "cp em_path.h.src ../h/em_path.h"
-end

diff --git a/distr/Action1 b/distr/Action1
index d923031..dc1e371 100644 (file)
--- a/distr/Action1
+++ b/distr/Action1
@@ -10,3 +10,7 @@ name "m68020/ncg bootstrap files"
 dir mach/m68020/ncg
 action "make EMHOME=/proj/em/Work distr"
 end
+name "m68k4/cg bootstrap files"
+dir mach/m68k4/cg
+action "make EMHOME=/proj/em/Work distr"
+end

diff --git a/distr/dwalk b/distr/dwalk
index 045f204..45a331a 100755 (executable)
--- a/distr/dwalk
+++ b/distr/dwalk
@@ -7,10 +7,6 @@ else
 fi
 ${DF-:} $CDIR .distr
 if test ! -r $DESTDIR/$CDIR/.distr
-then
-       ( cd $DESTDIR/$CDIR; make .distr ) >/dev/null 2>&1
-fi
-if test ! -r $DESTDIR/$CDIR/.distr
 then
        echo ++ no .distr in $CDIR
         exit 0
@@ -23,7 +19,7 @@ do
                  then 
                        CDIR=$CDIR/$i
                        export CDIR
-                       exec /proj/em/Work/distr/dwalk $*
+                       exec $DDIR/dwalk $*
                  else
                        echo ++ Could not access $CDIR/$i
                  fi

diff --git a/distr/mkd b/distr/mkd
index 69e25f0..b6415f1 100755 (executable)
--- a/distr/mkd
+++ b/distr/mkd
@@ -5,14 +5,10 @@ case $1 in
 esac
 p=`pwd`
 cd $DESTDIR/$1
-if [ $# = 2 ] && [ -f $p/$2 ]
+if [ $# = 2 ]
 then
-       RV $p $p/$2 > /dev/null 2>&1
+       RV $p $2 > /dev/null 2>&1
 else
-       if [ $# = 2 ]
-       then
-               echo "-- $1 no $2 Save Record yet"
-       fi
        if `CV $p > /dev/null 2>&1`
        then
                :

diff --git a/distr/mkf b/distr/mkf
index 74a47dc..58af7aa 100755 (executable)
--- a/distr/mkf
+++ b/distr/mkf
@@ -6,6 +6,9 @@ elif grep LIST $DESTDIR/$1/.distr >/dev/null 2>&1 &&
      ${DA-false} "$1" "$2"
 then
 :      Fetched library contents one by one and put them together
+elif ( cd $DESTDIR/$1 ; make $2 ) > /dev/null 2>&1
+then
+       echo ++ $1/$2 made
 else
        echo ++ $1/$2 not present
 fi

diff --git a/distr/mktree b/distr/mktree
index 2cf22f9..e640089 100644 (file)
--- a/distr/mktree
+++ b/distr/mktree
@@ -2,7 +2,7 @@ case $# in
 1|2)   ;;
 *)     echo $0 directory [ SVrecord ] ; exit 1 ;;
 esac
-DDIR=/proj/em/Work/distr
+DDIR=/usr/proj/em/Work/distr
 case $1 in
 /*)    DESTDIR=$1 ;;
 *)     DESTDIR=`pwd`/$1 ;;
@@ -10,5 +10,5 @@ esac
 DD=$DDIR/mkd
 DF=$DDIR/mkf
 DA=$DDIR/mka
-export DESTDIR DD DF DA
+export DDIR DESTDIR DD DF DA
 $DDIR/dwalk $2