From d7fd19506d7d787706c97e82e61bf27b5606fc5d Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Mon, 3 Oct 2005 03:33:19 +0000 Subject: [PATCH] No need to export variables as we're only using one Makefile --- functions | 12 ++++++------ jhalfs | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/functions b/functions index c3c9e1d..9a7d265 100644 --- a/functions +++ b/functions @@ -1,9 +1,9 @@ -export BRW= "" -export RED= "" -export GREEN= "" -export ORANGE= "" -export BLUE= "" -export WHITE= "" +BRW= "" +RED= "" +GREEN= "" +ORANGE= "" +BLUE= "" +WHITE= "" define echo_message @echo $(BRW) diff --git a/jhalfs b/jhalfs index 048dde3..7f9689d 100755 --- a/jhalfs +++ b/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