From 7fda3614058be845902b8068fbba9884ec32afae Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 11 Dec 2007 23:24:38 +0000 Subject: [PATCH] don't re-copy out conf files on make install if you have intentionally moved them to .noload git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6684 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 106167133e..3e9a1dae40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -175,7 +175,9 @@ install-data-local: 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|/[^/]*$$||'`; \