r2060 - jhalfs/trunk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Oct 2 20:33:20 PDT 2005


Author: jhuntwork
Date: 2005-10-02 21:33:19 -0600 (Sun, 02 Oct 2005)
New Revision: 2060

Modified:
   jhalfs/trunk/functions
   jhalfs/trunk/jhalfs
Log:
No need to export variables as we're only using one Makefile

Modified: jhalfs/trunk/functions
===================================================================
--- jhalfs/trunk/functions	2005-10-03 03:24:16 UTC (rev 2059)
+++ jhalfs/trunk/functions	2005-10-03 03:33:19 UTC (rev 2060)
@@ -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)

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-03 03:24:16 UTC (rev 2059)
+++ jhalfs/trunk/jhalfs	2005-10-03 03:33:19 UTC (rev 2060)
@@ -524,9 +524,9 @@
   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 @@
   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
 




More information about the alfs-log mailing list