bkruse: branch 2.0 r3662 - /branches/2.0/Makefile

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Wed Aug 13 17:16:00 2008
New Revision: 3662

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3662
Log:
Taking out make samples, as we have no configs/
directory, or no sample configs (All the ones we
care about are installed by asterisk's make samples)

Modified:
    branches/2.0/Makefile

Modified: branches/2.0/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/Makefile?view=diff&rev=3662&r1=3661&r2=3662
==============================================================================
--- branches/2.0/Makefile (original)
+++ branches/2.0/Makefile Wed Aug 13 17:16:00 2008
@@ -34,9 +34,6 @@
   ASTCFLAGS+=-I/usr/local/include
   ASTLDFLAGS+=-L/usr/local/lib
 endif
-
-# Overwite config files on "make samples"
-OVERWRITE:=y
 
 # Staging directory
 # Files are copied here temporarily during the install process
@@ -238,17 +235,13 @@
 	fi
 
 install: _install
+	@echo "                                              "
 	@echo " +---- Asterisk GUI Installation Complete ---+"
 	@echo " +                                           +"
 	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
 	@echo " +                                           +"
 	@echo " + Asterisk-GUI has successfully been        +"
-	@echo " + installed.  If you would like to install  +"
-	@echo " + the addtional sample configuration files  +"
-	@echo " + (overwriting any existing config files),  +"
-	@echo " + run:                                      +"
-	@echo " +                                           +"
-	@echo " +               $(MAKE) samples                +"
+	@echo " + installed.				     +"
 	@echo " +                                           +"
 	@echo " +-------------------------------------------+"
 	@echo " +                                           +"
@@ -286,28 +279,10 @@
 		echo "Not under version control";  \
 	fi
 
-samples:
-	mkdir -p $(ASTETCDIR)
-	for x in configs/*.sample; do \
-		if [ -f $(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-			if [ "$(OVERWRITE)" = "y" ]; then \
-				if cmp -s $(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
-					echo "Config file $$x is unchanged"; \
-					continue; \
-				fi ; \
-				mv -f $(ASTETCDIR)/`$(BASENAME) $$x .sample` $(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
-			else \
-				echo "Skipping config file $$x"; \
-				continue; \
-			fi ;\
-		fi ; \
-		$(INSTALL) -m 644 $$x $(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
-	done
-
 makeopts: configure
 	@echo "****"
 	@echo "**** The configure script must be executed before running '$(MAKE)'."
 	@echo "****"
 	@exit 1
 
-.PHONY: samples clean all install _all _install checkconfig distclean $(SUBDIRS_CLEAN) $(SUBDIRS_INSTALL) $(SUBDIRS)
+.PHONY: clean all install _all _install checkconfig distclean $(SUBDIRS_CLEAN) $(SUBDIRS_INSTALL) $(SUBDIRS)