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

No need to export variables as we're only using one Makefile

Browse source
This commit is contained in:
Jeremy Huntwork 2005-10-03 03:33:19 +00:00
parent 8bb92e71d0
commit d7fd19506d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
functions
View file

@ -1,9 +1,9 @@
export BRW= "" BRW= ""
export RED= "" RED= ""
export GREEN= "" GREEN= ""
export ORANGE= "" ORANGE= ""
export BLUE= "" BLUE= ""
export WHITE= "" WHITE= ""
define echo_message define echo_message
@echo $(BRW) @echo $(BRW)

8
jhalfs
View file

@ -524,9 +524,9 @@ build_Makefile() {
echo -e "$HEADER\n" > $MKFILE echo -e "$HEADER\n" > $MKFILE
# Add some variables and include the functions file # Add some variables and include the functions file
echo "export SRC := /sources" >> $MKFILE echo "SRC= /sources" >> $MKFILE
echo "export LFS := $BUILDDIR" >> $MKFILE echo "LFS= $BUILDDIR" >> $MKFILE
echo -e "export LOGDIR := $LOGDIR\n" >> $MKFILE echo -e "LOGDIR= $LOGDIR\n" >> $MKFILE
echo -e "include functions\n" >> $MKFILE echo -e "include functions\n" >> $MKFILE
# Add chroot commands # Add chroot commands
@ -534,7 +534,7 @@ build_Makefile() {
for file in chapter06/*chroot* ; do for file in chapter06/*chroot* ; do
chroot=`cat $file | sed -e '/#!\/bin\/sh/d' -e 's@ \\\@ @g' | tr -d '\n' | sed \ chroot=`cat $file | sed -e '/#!\/bin\/sh/d' -e 's@ \\\@ @g' | tr -d '\n' | sed \
-e 's/ */ /g' -e 's|\\$|&&|g' -e 's|$| -c|'` -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` i=`expr $i + 1`
done done