[RFC 2/2 v2] PR1176: Added --with-cacao-src-dir option

[Stefan Ring]

https://bitbucket.org/Ringdingcoder/icedtea7/commits/75567c2025d9a4b8ef88a8d5dbd9622b57e32b12

diff -r bd37843206b2 -r 75567c2025d9 ChangeLog
--- a/ChangeLog	Thu Dec 20 16:41:31 2012 +0100
+++ b/ChangeLog	Thu Dec 20 16:41:33 2012 +0100
@@ -1,3 +1,8 @@
+2012-12-20  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	Transplant of b20e2e867dd8 from icedtea6
+	* Makefile.am: copy entire CACAO directory, including .hg
+
 2012-12-20  Stefan Ring  <stefan at complang.tuwien.ac.at>

 	PR1176: Added --with-cacao-src-dir option
diff -r bd37843206b2 -r 75567c2025d9 Makefile.am
--- a/Makefile.am	Thu Dec 20 16:41:31 2012 +0100
+++ b/Makefile.am	Thu Dec 20 16:41:33 2012 +0100
@@ -1282,10 +1282,10 @@
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_DIR
 	set -e ; \
-	if ! test -d cacao ; \
+	if ! test -d cacao/cacao ; \
 	then \
-	  mkdir -p cacao/cacao ; \
-	  cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
+	  mkdir cacao ; \
+	  cp -rL $(ALT_CACAO_SRC_DIR) cacao/cacao ; \
 	fi
 else
 	set -e ; \