You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 10:46:32 UTC
svn commit: r1132117 - /incubator/mesos/trunk/src/Makefile.in
Author: benh
Date: Sun Jun 5 08:46:31 2011
New Revision: 1132117
URL: http://svn.apache.org/viewvc?rev=1132117&view=rev
Log:
Modified Makefile to not replace conf/mesos.conf if the template changes
and to not delete it on make clean. It was surprising that settings were
lost in the old version.
Modified:
incubator/mesos/trunk/src/Makefile.in
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1132117&r1=1132116&r2=1132117&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 08:46:31 2011
@@ -331,8 +331,8 @@ endif
$(DEPLOY_FILES): $(DEPLOYDIR)/%: @srcdir@/deploy/% | $(DEPLOYDIR)
cp -r $< $@
-$(CONFDIR)/mesos.conf: @srcdir@/conf/mesos.conf.template | $(CONFDIR)
- cp -r $< $@
+$(CONFDIR)/mesos.conf: | @srcdir@/conf/mesos.conf.template $(CONFDIR)
+ cp -r @srcdir@/conf/mesos.conf.template $@
test: all
$(MAKE) -C tests test
@@ -378,7 +378,6 @@ clean:
rm -f webui/slave/swig/slave.py
rm -f $(BINDIR)/webui/master/swig/master.py
rm -f $(BINDIR)/webui/master/swig/master.pc
- rm -f $(CONF_FILES)
rm -f $(DEPLOY_FILES)
rm -f TAGS