[Freeswitch-trunk] [commit] r6684 - freeswitch/trunk

[Freeswitch SVN]

Author: mikej
Date: Tue Dec 11 18:24:38 2007
New Revision: 6684

Modified:
   freeswitch/trunk/Makefile.am

Log:
don't re-copy out conf files on make install if you have intentionally moved them to .noload

Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am	(original)
+++ freeswitch/trunk/Makefile.am	Tue Dec 11 18:24:38 2007
@@ -175,7 +175,9 @@
 		dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \
 		filename=`echo $$conffile | sed -e 's|^.*/||'`; \
 		test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \
-		test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \
+		test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || \
+		test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename.noload || \
+			$(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \
 	done ; 
 	for htdocsfile in `find htdocs -name \* | grep -v .svn` ; do \
 		dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \