From 86f61fe0b25608052fd3f94141744b6337e09c88 Mon Sep 17 00:00:00 2001
From: twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 10 Jul 2008 21:05:05 +0000
Subject: Merged revisions 129738 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
r129738 | twilson | 2008-07-10 15:56:20 -0500 (Thu, 10 Jul 2008) | 2 lines

Move phoneprov config files to be installed with 'make samples' so changes aren't inadvertently lost on a 'make install'

........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129739 f38db490-d61c-443f-a65b-d21fe96a405b
---
 Makefile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a75484178..06e957b7f 100644
--- a/Makefile
+++ b/Makefile
@@ -457,10 +457,6 @@ datafiles: _all
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
-	for x in phoneprov/*; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/phoneprov ; \
-	done
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
 	for x in static-http/*; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
@@ -699,6 +695,24 @@ samples: adsi
 	fi
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
+	@mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
+	@for x in phoneprov/*; do \
+		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
+		if [ -f $${dst} ]; then \
+			if [ "$(OVERWRITE)" = "y" ]; then \
+				if cmp -s $${dst} $$x ; then \
+					echo "Config file $$x is unchanged"; \
+					continue; \
+				fi ; \
+				mv -f $${dst} $${dst}.old ; \
+			else \
+				echo "Skipping config file $$x"; \
+				continue; \
+			fi ;\
+		fi ; \
+		echo "Installing file $$x"; \
+		$(INSTALL) -m 644 $$x $${dst} ;\
+	done
 
 webvmail:
 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
-- 
cgit v1.2.3