r3582 - jhalfs/branches/ablfs/BLFS

pierre at linuxfromscratch.org pierre at linuxfromscratch.org
Wed Feb 29 05:12:10 PST 2012


Author: pierre
Date: 2012-02-29 06:12:01 -0700 (Wed, 29 Feb 2012)
New Revision: 3582

Modified:
   jhalfs/branches/ablfs/BLFS/gen-makefile.sh
Log:
Change a few variables in gen-makefile.sh, and clean work directory

Modified: jhalfs/branches/ablfs/BLFS/gen-makefile.sh
===================================================================
--- jhalfs/branches/ablfs/BLFS/gen-makefile.sh	2012-02-28 18:12:12 UTC (rev 3581)
+++ jhalfs/branches/ablfs/BLFS/gen-makefile.sh	2012-02-29 13:12:01 UTC (rev 3582)
@@ -4,8 +4,8 @@
 #
 set -e
 
-# TEMPORARY VARIABLES.. development use only
-declare TOPDIR=$(cd ..; pwd)
+declare TOPDIR='..'
+declare ATOPDIR=`cd $TOPDIR; pwd`
 declare MKFILE=Makefile
 declare PREV_PACKAGE=""
 declare BUILD_SCRIPTS=${TOPDIR}/scripts
@@ -58,7 +58,7 @@
 	--stringparam package ${pkg_name#*-?-} \\
 	-o track.tmp \\
 	${BUMP} \$(TRACKING_FILE) && \\
-	sed -i 's at PACKDESC@${TOPDIR}/packdesc.dtd@' track.tmp && \\
+	sed -i 's at PACKDESC@${ATOPDIR}/packdesc.dtd@' track.tmp && \\
 	xmllint --format --postvalid track.tmp > \$(TRACKING_FILE) && \\
         rm track.tmp && \\
 	touch  \$@ && \\
@@ -160,8 +160,11 @@
   exit 1
 fi
 
+# Let us make a clean base:
+rm -rf *
+
 generate_Makefile
 
-cp ../progress_bar.sh .
+cp ${TOPDIR}/progress_bar.sh .
 
 mkdir -p logs




More information about the alfs-log mailing list