build: correct install locations of pmproxy configs

performancecopilot · Apr 26, 2019 · 6989da0 · 6989da0
1 parent f2ff398
commit 6989da0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build/rpm/fedora.spec b/build/rpm/fedora.spec
@@ -2843,6 +2843,7 @@ cd
 %config(noreplace) %{_confdir}/pmcd/rc.local
 %dir %{_confdir}/pmproxy
 %config(noreplace) %{_confdir}/pmproxy/pmproxy.options
+%config(noreplace) %{_confdir}/pmproxy/pmproxy.conf
 %dir %{_confdir}/pmie
 %dir %{_confdir}/pmie/control.d
 %config(noreplace) %{_confdir}/pmie/control
@@ -2854,8 +2855,6 @@ cd
 %dir %attr(0775,pcp,pcp) %{_confdir}/nssdb
 %dir %{_confdir}/discover
 %config(noreplace) %{_confdir}/discover/pcp-kube-pods.conf
-%dir %{_confdir}/pmproxy
-%config(noreplace) %{_confdir}/pmproxy/pmproxy.conf
 %dir %{_confdir}/pmseries
 %config(noreplace) %{_confdir}/pmseries/pmseries.conf
 

diff --git a/src/pmproxy/GNUmakefile b/src/pmproxy/GNUmakefile
@@ -17,7 +17,6 @@ TOPDIR = ../..
 include $(TOPDIR)/src/include/builddefs
 
 SUBDIRS = src
-CONFIGS = pmproxy.conf pmproxy.options pmproxy.defaults
 LDIRT = *.log pmproxy.service
 
 default: $(SUBDIRS) pmproxy.service
@@ -26,7 +25,8 @@ default: $(SUBDIRS) pmproxy.service
 install: $(SUBDIRS)
 	$(SUBDIRS_MAKERULE)
 	$(INSTALL) -m 755 -d $(PCP_SYSCONF_DIR)/pmproxy
-	$(INSTALL) -m 644 $(CONFIGS) $(PCP_SYSCONF_DIR)/pmproxy
+	$(INSTALL) -m 644 pmproxy.conf pmproxy.options $(PCP_SYSCONF_DIR)/pmproxy
+	$(INSTALL) -m 644 pmproxy.defaults $(PCP_SYSCONFIG_DIR)/pmproxy
 	$(INSTALL) -m 755 rc_pmproxy $(PCP_RC_DIR)/pmproxy
 ifeq ($(ENABLE_SYSTEMD),true)
 	$(INSTALL) -m 644 pmproxy.service $(PCP_SYSTEMDUNIT_DIR)/pmproxy.service