PERFORCE change 124595 for review

[Gabor Kovesdan]

http://perforce.freebsd.org/chv.cgi?CH=124595

Change 124595 by gabor at gabor_server on 2007/08/03 14:12:41

	- Use ECHO_MSG properly [1]
	- Indentation
	
	Spotted by:	pav [1]

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#32 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#32 (text+ko) ====

@@ -117,8 +117,8 @@
 .if !target(do-chroot)
 do-chroot:
 	@if [ "${WITH_EXPERIMENTAL_DESTDIR}" = "no" ]; then \
-		${ECHO_CMD} "===>  DESTDIR is experimental, set WITH_EXPERIMENTAL_DESTDIR"; \
-		${ECHO_CMD} "===>  if you want to use it."; \
+		${ECHO_MSG} "===>  DESTDIR is experimental, set WITH_EXPERIMENTAL_DESTDIR"; \
+		${ECHO_MSG} "===>  if you want to use it."; \
 		exit 0; \
 	fi; \
 	if [ ! -d ${DESTDIR} ]; then \
@@ -161,7 +161,7 @@
 				_dest_path=$${_full_dest_path#$${_destdir}}; \
 				_created_mountpoints_list="$${_full_dest_path} $${_created_mountpoints_list}"; \
 			else \
-				${ECHO_CMD} "===> Failed to create temporary mount point"; \
+				${ECHO_MSG} "===> Failed to create temporary mount point"; \
 				exit 9; \
 			fi; \
 		else \
@@ -180,7 +180,7 @@
 				_entry_was_created=1; \
 				_created_mountpoints_list="$${_created_mountpoints_list} ${_full_dest_path}"; \
 			else \
-				${ECHO_CMD} "===> Mount point $${_full_dest_path} could not be created"; \
+				${ECHO_MSG} "===> Mount point $${_full_dest_path} could not be created"; \
 				exit 7; \
 			fi; \
 		[ "$${_entry_should_mount}" = "0" ] || \
@@ -189,7 +189,7 @@
 				_mounted_entries_list="$${_full_dest_path} $${_mounted_entries_list}"; \
 				_var_path_list="$${_var_path_list} $${_mount_var}=$${_dest_path}"; \
 			else \
-				${ECHO_CMD} "===> Dir $${_host_path} could not be mounted"; \
+				${ECHO_MSG} "===> Dir $${_host_path} could not be mounted"; \
 				[ "$${_entry_was_created}" = "0" ] || \
 					${RMDIR} $${_full_dest_path} || ${TRUE}; \
 				exit 8; \
@@ -202,7 +202,7 @@
 			${DEBUG_MSG} "devfs mounted"; \
 			_mounted_entries_list="$${_full_dest_path} $${_mounted_entries_list}"; \
 		else \
-			${ECHO_CMD} "===> devfs could not be mounted"; \
+			${ECHO_MSG} "===> devfs could not be mounted"; \
 			[ -n "$${_created_mountpoints_list%%* $${_destdir}/dev *}" ] || \
 				${RMDIR} $${_destdir}/dev || ${TRUE}; \
 			exit 9; \
@@ -211,14 +211,14 @@
 	${DEBUG_MSG} "Things we mounted: $${_mounted_entries_list}"; \
 	${DEBUG_MSG} "Things we created: $${_created_mountpoints_list}"; \
 	${DEBUG_MSG} "_var_path_list: $${_var_path_list}"; \
-	${ECHO_CMD} "===>  Starting chrooted make in ${DESTDIR}..."; \
+	${ECHO_MSG} "===>  Starting chrooted make in ${DESTDIR}..."; \
 	export $${_var_path_list}; \
 	${CHROOT} $${_destdir} ${SH} -c "\
 		cd $${PORTSDIR}${.CURDIR:S|^${PORTSDIR}||}; \
 		${SETENV} -i ${DESTDIR_ENV} $${_var_path_list} ${MAKE} ${.TARGETS}" && \
-		${ECHO_CMD} "===>  Chrooted make in ${DESTDIR} succeeded" || \
-		${ECHO_CMD} "===>  Chrooted make in ${DESTDIR} failed"; \
-	${ECHO_CMD} "===>  Cleaning up..."; \
+		${ECHO_MSG} "===>  Chrooted make in ${DESTDIR} succeeded" || \
+		${ECHO_MSG} "===>  Chrooted make in ${DESTDIR} failed"; \
+		${ECHO_MSG} "===>  Cleaning up..."; \
 	for _entry in $${_mounted_entries_list}; do \
 		${UMOUNT} -f $${_entry} || ${TRUE}; \
 	done; \