r2665 - in jhalfs/trunk: . BLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun May 7 08:48:09 PDT 2006


Author: manuel
Date: 2006-05-07 09:48:08 -0600 (Sun, 07 May 2006)
New Revision: 2665

Modified:
   jhalfs/trunk/BLFS/master.sh
   jhalfs/trunk/master.sh
Log:
Don't copy some files when building BLFS.
Fixed BLFS Makefile generation bug.

Modified: jhalfs/trunk/BLFS/master.sh
===================================================================
--- jhalfs/trunk/BLFS/master.sh	2006-05-07 14:56:41 UTC (rev 2664)
+++ jhalfs/trunk/BLFS/master.sh	2006-05-07 15:48:08 UTC (rev 2665)
@@ -91,7 +91,7 @@
 
     # Include a touch of the target name so make can check
     # if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    echo -e '\t at touch $@' >> $MKFILE
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #

Modified: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh	2006-05-07 14:56:41 UTC (rev 2664)
+++ jhalfs/trunk/master.sh	2006-05-07 15:48:08 UTC (rev 2665)
@@ -482,8 +482,10 @@
       cp $FILES $JHALFSDIR/
     popd 1> /dev/null
   fi
-  [[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
-  [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  if [[ "$PROGNAME" != "blfs" ]]; then
+    [[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
+    [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  fi
   sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
   export XSL=$JHALFSDIR/${XSL}
 fi
@@ -494,7 +496,7 @@
 
 # After be sure that all look sane and if REPORT=1, dump the settings to a file
 # This file will be used to create the REPORT header
-[[ "$REPORT" = "1" ]] && validate_config > $JHALFSDIR/jhalfs.config
+[[ "$PROGNAME" != "blfs" ]] && [[ "$REPORT" = "1" ]] && validate_config > $JHALFSDIR/jhalfs.config
 
 >$LOGDIR/$LOG
 




More information about the alfs-log mailing list