浏览代码

Some more fine-tuning of the installation mechanism

ceriel 32 年之前
父节点
当前提交
5fdefde095
共有 2 个文件被更改,包括 9 次插入9 次删除
  1. 7 9
      first/install_tail
  2. 2 0
      first/mk_config

+ 7 - 9
first/install_tail

@@ -6,19 +6,17 @@ export PATH
 $SRC_HOME/first/create_dir $CONFIG
 $SRC_HOME/first/create_dir $CONFIG/bin
 
-cat macros $SRC_HOME/first/mk_config > $CONFIG/bin/mk_config
-cat macros $SRC_HOME/first/mk_target > $CONFIG/bin/mk_target
-cat macros $SRC_HOME/first/limit_impl > $CONFIG/bin/limit_impl
-
+echo "PATH=::$CONFIG/bin:$UTIL_HOME/bin:/bin:/usr/bin:/usr/ucb; export PATH" > $CONFIG/bin/TakeAction
+cat $SRC_HOME/TakeAction >> $CONFIG/bin/TakeAction
 sed '/^#PARAMS/r make_macros' < $SRC_HOME/first/mk_makefile > $CONFIG/bin/mk_makefile
-chmod +x $CONFIG/bin/*
 cp $SRC_HOME/first/create_dir $CONFIG/bin/create_dir
+chmod +x $CONFIG/bin/*
 
-mk_config
+$SRC_HOME/first/mk_config
 
-mk_target
+$SRC_HOME/first/mk_target
 
-limit_impl
+$SRC_HOME/first/limit_impl
 
 case $SYSNAME in
 i386)
@@ -82,4 +80,4 @@ esac
 : and finally installing ...
 cd $CONFIG
 set +e
-exec $SRC_HOME/TakeAction
+exec TakeAction

+ 2 - 0
first/mk_config

@@ -108,6 +108,7 @@ EOF
 	for j in libcc libcc.ansi libm2 libpc libbc liboc libf77
 	do
 	    create_dir $i/$j
+	    rm -f $i/$j/No*
 	    cd $i/$j
 	    mk_makefile $SRC_HOME/mach/proto/libg/proto.$j | sed -e "/#MACH_PARAMS/r $SRC_HOME/mach/$i/mach_params" > Makefile
 	    cd ../..
@@ -118,6 +119,7 @@ EOF
 	then :
 	else 
 		create_dir $i/libsys
+		rm -f $i/libsys/No*
 		cd $i/libsys
 		mk_makefile $SRC_HOME/mach/proto/libg/proto.sysmon | sed -e "/#MACH_PARAMS/r $SRC_HOME/mach/$i/mach_params" > Makefile
 		cd ../..