Lines 1-15
Link Here
|
1 |
--- Makefile.am.orig 2017-11-18 09:03:27 UTC |
1 |
--- Makefile.am.orig 2019-06-13 09:13:42 UTC |
2 |
+++ Makefile.am |
2 |
+++ Makefile.am |
3 |
@@ -165,7 +165,7 @@ AM_CPPFLAGS = \ |
3 |
@@ -187,7 +187,7 @@ AM_CPPFLAGS = \ |
4 |
-DPREFIX='"${prefix}"' \ |
4 |
-DPREFIX='"${prefix}"' \ |
5 |
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ |
5 |
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ |
6 |
-DLOCALSTATEDIR='"${localstatedir}"' \ |
6 |
-DLOCALSTATEDIR='"${localstatedir}"' \ |
7 |
- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ |
7 |
- -DPKGLOCALSTATEDIR='"${cpkglocalstatedir}"' \ |
8 |
+ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ |
8 |
+ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ |
9 |
-DPLUGINDIR='"${pkglibdir}"' \ |
9 |
-DPLUGINDIR='"${cpkglibdir}"' \ |
10 |
-DPKGDATADIR='"${pkgdatadir}"' |
10 |
-DPKGDATADIR='"${cpkgdatadir}"' |
11 |
|
11 |
if BUILD_WIN32 |
12 |
@@ -1964,15 +1964,10 @@ endif |
12 |
@@ -2184,15 +2184,10 @@ endif |
13 |
|
13 |
|
14 |
install-exec-hook: |
14 |
install-exec-hook: |
15 |
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run |
15 |
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run |
Lines 19-29
Link Here
|
19 |
$(mkinstalldirs) $(DESTDIR)$(sysconfdir) |
19 |
$(mkinstalldirs) $(DESTDIR)$(sysconfdir) |
20 |
- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ |
20 |
- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ |
21 |
- then \ |
21 |
- then \ |
22 |
- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ |
22 |
- $(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ |
23 |
- else \ |
23 |
- else \ |
24 |
- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ |
24 |
- $(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ |
25 |
- fi; \ |
25 |
- fi; \ |
26 |
+ $(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample |
26 |
+ $(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample |
27 |
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) |
27 |
$(mkinstalldirs) $(DESTDIR)$(cpkgdatadir) |
28 |
$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db; |
28 |
$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db; |
29 |
$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \ |
29 |
$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \ |