Reverted the cd into PKGDIR, already covered by envars. Fixed spurious '\' in Makefile.

This commit is contained in:
Jeremy Huntwork 2005-10-05 01:14:48 +00:00
parent 4aa0c1c858
commit 2e51f442cd

14
jhalfs
View file

@ -524,7 +524,7 @@ EOF
@\$(call unpack,$FILE)
@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\
echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
echo "export PKGDIR" >> envars\\
echo "export PKGDIR" >> envars
EOF
) >> $MKFILE.tmp
fi
@ -548,16 +548,6 @@ EOF
commands/$file >>logs/$i 2>&1 && \\
echo -e "\n\`date\`\n\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\n" >>logs/$i
EOF
) >> $MKFILE.tmp
# If we have a package we need to cd into the directory
elif [ "$vrs" != "" ] ; then
(
cat << EOF
@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >logs/$i && \\
\$(CHROOT1) 'cd /jhalfs && source envars && cd \$\$PKGDIR && /jhalfs/commands/$file >>logs/$i 2>&1' && \\
echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >>logs/$i
EOF
) >> $MKFILE.tmp
# The rest of Chapter06
@ -565,7 +555,7 @@ EOF
(
cat << EOF
@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >logs/$i && \\
\$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/commands/$file >>logs/$i 2>&1' && \\
\$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/commands/$file >>/jhalfs/logs/$i 2>&1' && \\
echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >>logs/$i
EOF
) >> $MKFILE.tmp