Properly prep/compile when <package>/source exists

 * Corrected some buggy dependancies when we had an in-tree source checkout.

1 files changed, 7 insertions, 10 deletions

diff --git a/libexec/build-makedeps b/libexec/build-makedeps
index 102e173..ce9a28b 100755
--- a/libexec/build-makedeps
+++ b/libexec/build-makedeps
@@ -160,23 +160,20 @@ for package; do
 		(*)		die "do not know how to handle url '${url}'";;
 		esac
 	done
-	echo "${makedep_source}: ${PACKAGE_SOURCES}"
 
 	if test -e "${makedep_source}"; then
-		cat<<-EOF
-		all_fetch all_all_fetch ${makedep_target}_fetch: ${BUILDER_PKGDIR}/${package}/source
-		EOF
+		printf "${makedep_source}:\n"
+		printf "all_fetch all_all_fetch ${makedep_target}_fetch:\n"
+		printf "${makedep_prep}: ${makedep_target}_fetch\n\t@build-make-prep '${package}'\n"
+		printf "${makedep_target}_fetch:\n\t@rm -f ${makedep_prep}\n"
 	else
-		cat<<-EOF
-		${makedep_prep}: ${PACKAGE_SOURCES}
-		all_fetch all_all_fetch ${makedep_target}_fetch: ${PACKAGE_SOURCES}
-		EOF
+		printf "${makedep_source}: ${PACKAGE_SOURCES}\n\t@build-make-source '${package}'\n"
+		printf "${makedep_prep}: ${PACKAGE_SOURCES}\n\t@build-make-prep '${package}'\n"
+		printf "all_fetch all_all_fetch ${makedep_target}_fetch: ${PACKAGE_SOURCES}\n"
 	fi
 
 	##
 	# Produce the various build commands
-	printf "${makedep_source}:\n\t@build-make-source '${package}'\n"
-	printf "${makedep_prep}:\n\t@build-make-prep '${package}'\n"
 	printf "${makedep_compile}: ${makedep_prep}\n\t@build-make-compile '${package}'\n"
 	printf "${makedep_package}: ${makedep_compile}\n\t@build-make-package '${package}'\n"
 	printf "${makedep_install}: ${makedep_package}\n\t@build-make-install '${package}'\n"