[svn-commits] tilghman: trunk r311 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: tilghman
Date: Mon Sep 25 09:39:55 2006
New Revision: 311

URL: http://svn.digium.com/view/asterisk-addons?rev=311&view=rev
Log:
Merged revisions 310 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r310 | tilghman | 2006-09-25 09:37:57 -0500 (Mon, 25 Sep 2006) | 2 lines

Combination of tabs and spaces makes the Makefile difficult to follow

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Sep 25 09:39:55 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308
+/branches/1.4:1-299,308,310

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?rev=311&r1=310&r2=311&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Sep 25 09:39:55 2006
@@ -166,18 +166,18 @@
 	for x in configs/*.sample; do \
 		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
 			if [ "$(OVERWRITE)" = "y" ]; then \
-                                if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-                                        echo "Config file $$x is unchanged"; \
-                                        continue; \
-                                fi ; \
-                                mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
-                        else \
-                                echo "Skipping config file $$x"; \
-                                continue; \
-                        fi ;\
-                fi ; \
-                $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
-        done
+				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
+					echo "Config file $$x is unchanged"; \
+					continue; \
+				fi ; \
+				mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
+			else \
+				echo "Skipping config file $$x"; \
+				continue; \
+			fi ;\
+		fi ; \
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
+	done
 
 update:
 	@if [ -d .svn ]; then \