Fix build error on RPM

treasure-data · Apr 1, 2014 · cca43bc · cca43bc
1 parent c3ec35d
commit cca43bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -80,7 +80,7 @@ install: install-recursive
 	mkdir -p $(DESTDIR)$(sysconfdir)/td-agent
 	cp -f $(srcdir)/td-agent.conf $(DESTDIR)$(sysconfdir)/td-agent/td-agent.conf.tmpl
 	if [ -f "$(srcdir)/td-agent.conf.custom" ]; then \
-	    cp -f $(srcdir)/td-agent.conf.custom $(DESTDIR)$(sysconfdir)/td-agent/td-agent.conf; \
+	    cp -f $(srcdir)/td-agent.conf.custom $(DESTDIR)$(sysconfdir)/td-agent/td-agent.conf.tmpl; \
 	fi
 	mkdir -p $(DESTDIR)$(sysconfdir)/td-agent/prelink.conf.d
 	cp -f $(srcdir)/td-agent.prelink.conf $(DESTDIR)$(sysconfdir)/td-agent/prelink.conf.d/td-agent.conf

diff --git a/redhat/td-agent.spec b/redhat/td-agent.spec
@@ -122,7 +122,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%config(noreplace,missingok) %{_sysconfdir}/td-agent/td-agent.conf
+#%config(noreplace,missingok) %{_sysconfdir}/td-agent/td-agent.conf
 /usr/bin/td
 /usr/sbin/td-agent
 /usr/%{_lib}/fluent