From 7646771a8df242ed8cb0ebfa8940e9599258783b Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 21 Dec 2015 00:31:53 -0800
Subject: [PATCH] Makefile.usr - Allow /usr/src to pre-exist

* Check for /usr/src/.git instead of /usr/src when generating warnings.
---
 etc/Makefile.usr | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index 5fa2485c0e..856eca62b8 100644
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -62,7 +62,7 @@ help all:
 src-create-repo:
 .if empty(THISGIT)
 	@echo ${GITNFMSG}
-.elif exists (${.CURDIR}/src)
+.elif exists (${.CURDIR}/src/.git)
 	@echo ${ERRSR}
 .else
 	@echo "If problems occur you may have to rm -rf src and try again."
@@ -78,7 +78,7 @@ src-create-repo:
 src-create: src-create-repo
 .if empty(THISGIT)
 	@echo ${GITNFMSG}
-.elif exists (${.CURDIR}/src)
+.elif exists (${.CURDIR}/src/.git)
 	@echo ${ERRSR}
 .else
 	cd ${.CURDIR}/src && git checkout master
@@ -88,7 +88,7 @@ src-create: src-create-repo
 src-create-shallow:
 .if empty(THISGIT)
 	@echo ${GITNFMSG}
-.elif exists (${.CURDIR}/src)
+.elif exists (${.CURDIR}/src/.git)
 	@echo ${ERRSR}
 .else
 	@echo "If problems occur you may have to rm -rf src and try again."
@@ -106,7 +106,7 @@ src-create-shallow:
 src-checkout:
 .if empty(THISGIT)
 	@echo ${GITNFMSG}
-.elif !exists (${.CURDIR}/src)
+.elif !exists (${.CURDIR}/src/.git)
 	@echo ${ERRNSR}
 .else
 	cd ${.CURDIR}/src && git checkout master
@@ -115,7 +115,7 @@ src-checkout:
 src-update:
 .if empty(THISGIT)
 	@echo ${GITNFMSG}
-.elif !exists (${.CURDIR}/src)
+.elif !exists (${.CURDIR}/src/.git)
 	@echo ${ERRNSR}
 .else
 	cd ${.CURDIR}/src && git pull
-- 
2.41.0