]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
don't re-copy out conf files on make install if you have intentionally moved them...
authorMichael Jerris <mike@jerris.com>
Tue, 11 Dec 2007 23:24:38 +0000 (23:24 +0000)
committerMichael Jerris <mike@jerris.com>
Tue, 11 Dec 2007 23:24:38 +0000 (23:24 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6684 d0543943-73ff-0310-b7d9-9358b9ac24b2

Makefile.am

index 106167133edc7ff5786c398e76e4c46e06e66f9b..3e9a1dae40832b29f41278756a50795720c40934 100644 (file)
@@ -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|/[^/]*$$||'`; \