Merge branch 'master' of gitpar:libretoolsspeculation-20110825

1 files changed, 6 insertions, 6 deletions

diff --git a/libremakepkg b/libremakepkg
index f9f7316..ef72526 100755
--- a/libremakepkg
+++ b/libremakepkg
@@ -33,7 +33,7 @@ function usage {         # Display message and exit
     echo ' -h          show this message.'
     echo ' -c          cleans the chroot before building.'
     echo ' -u          updates the chroot before building.'
-    echo ' -n          use this dir instead of "${CHCOPY}".'
+    echo ' -n          use this dir instead of "${CHROOT}".'
     echo ' -M <--arg>  passes long args to makepkg, use it as many times as needed.'
     echo
     exit 1
@@ -43,9 +43,9 @@ function buildenv {      # Mounts *DEST from makepkg.conf
 
     msg "Building env"
     for mp in ${SRCDEST} ${PKGDEST} ${SRCPKGDEST}; do
-        msg2 "binding ${mp} to ${CHROOTDIR}/${CHCOPY}${mp}"
-        mkdir -p "${CHROOTDIR}/${CHCOPY}${mp}"
-        mount -o bind ${mp} "${CHROOTDIR}/${CHCOPY}${mp}" || exit 1
+        msg2 "binding ${mp} to ${CHROOTDIR}/${CHROOT}${mp}"
+        mkdir -p "${CHROOTDIR}/${CHROOT}${mp}"
+        mount -o bind ${mp} "${CHROOTDIR}/${CHROOT}${mp}" || exit 1
     done
 
 }
@@ -91,7 +91,7 @@ function trap_exit {      # End inmediately but print a useful message
 # args are treated as part of the message
 
     for mp in ${SRCDEST} ${PKGDEST} ${SRCPKGDEST}; do
-        umount "${CHROOTDIR}/${CHCOPY}${mp}"
+        umount "${CHROOTDIR}/${CHROOT}${mp}"
     done
 
     copy_log
@@ -111,7 +111,7 @@ CLEAN_FIRST="n"
 CLEAN_CACHE=""
 UPDATE_FIRST="n"
 USE_LOG='n'
-CHROOTNAME=${CHCOPY}
+CHROOTNAME=${CHROOT}
 MAKEPKG_ARGS=""
 
 libremakepkgargs='hcuUn:I:M:'      # libremakepkg own args