No need to export variables as we're only using one Makefile
This commit is contained in:
parent
8bb92e71d0
commit
d7fd19506d
2 changed files with 10 additions and 10 deletions
12
functions
12
functions
|
@ -1,9 +1,9 @@
|
|||
export BRW= "[0;1m"
|
||||
export RED= "[0;31m"
|
||||
export GREEN= "[0;32m"
|
||||
export ORANGE= "[0;33m"
|
||||
export BLUE= "[1;34m"
|
||||
export WHITE= "[00m"
|
||||
BRW= "[0;1m"
|
||||
RED= "[0;31m"
|
||||
GREEN= "[0;32m"
|
||||
ORANGE= "[0;33m"
|
||||
BLUE= "[1;34m"
|
||||
WHITE= "[00m"
|
||||
|
||||
define echo_message
|
||||
@echo $(BRW)
|
||||
|
|
8
jhalfs
8
jhalfs
|
@ -524,9 +524,9 @@ build_Makefile() {
|
|||
echo -e "$HEADER\n" > $MKFILE
|
||||
|
||||
# Add some variables and include the functions file
|
||||
echo "export SRC := /sources" >> $MKFILE
|
||||
echo "export LFS := $BUILDDIR" >> $MKFILE
|
||||
echo -e "export LOGDIR := $LOGDIR\n" >> $MKFILE
|
||||
echo "SRC= /sources" >> $MKFILE
|
||||
echo "LFS= $BUILDDIR" >> $MKFILE
|
||||
echo -e "LOGDIR= $LOGDIR\n" >> $MKFILE
|
||||
echo -e "include functions\n" >> $MKFILE
|
||||
|
||||
# Add chroot commands
|
||||
|
@ -534,7 +534,7 @@ build_Makefile() {
|
|||
for file in chapter06/*chroot* ; do
|
||||
chroot=`cat $file | sed -e '/#!\/bin\/sh/d' -e 's@ \\\@ @g' | tr -d '\n' | sed \
|
||||
-e 's/ */ /g' -e 's|\\$|&&|g' -e 's|$| -c|'`
|
||||
echo -e "export CHROOT$i := $chroot\n" >> $MKFILE
|
||||
echo -e "CHROOT$i= $chroot\n" >> $MKFILE
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
|
||||
|
|
Reference in a new issue