zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merged r2665 from trunk.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-05-07 16:03:08 +00:00
parent 29f9ec8598
commit 708a612891
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/master.sh
View file

@ -91,7 +91,7 @@ EOF
# Include a touch of the target name so make can check
# if it's already been made.
echo -e '\t@touch $@' >> $MKFILE.tmp
echo -e '\t@touch $@' >> $MKFILE
#
#--------------------------------------------------------------------#
# >>>>>>>> END OF Makefile ENTRY <<<<<<<< #

8
master.sh
View file

@ -518,8 +518,10 @@ if [[ "$PWD" != "$JHALFSDIR" ]]; then
cp $FILES $JHALFSDIR/
popd 1> /dev/null
fi
[[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh $JHALFSDIR/
[[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl $JHALFSDIR/
if [[ "$PROGNAME" != "blfs" ]]; then
[[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh $JHALFSDIR/
[[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl $JHALFSDIR/
fi
sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
export XSL=$JHALFSDIR/${XSL}
fi
@ -530,7 +532,7 @@ fi
# After be sure that all look sane and if REPORT=1, dump the settings to a file
# This file will be used to create the REPORT header
[[ "$REPORT" = "1" ]] && validate_config > $JHALFSDIR/jhalfs.config
[[ "$PROGNAME" != "blfs" ]] && [[ "$REPORT" = "1" ]] && validate_config > $JHALFSDIR/jhalfs.config
>$LOGDIR/$LOG