projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
065f3ea
)
Fix warning that pkgdatadir and pkglibdir were previously defined.
author
campbellsean@google.com
<campbellsean@google.com>
Thu, 23 Aug 2018 14:19:46 +0000
(10:19 -0400)
committer
campbellsean@google.com
<campbellsean@google.com>
Thu, 23 Aug 2018 14:24:59 +0000
(10:24 -0400)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
cb40148
..
48a7cb3
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,11
+2,13
@@
ACLOCAL_AMFLAGS = -I m4
AM_YFLAGS = -d
if BUILD_WIN32
AM_YFLAGS = -d
if BUILD_WIN32
-pkgdatadir=$(datadir)
-pkglibdir=$(libdir)/plugins
-pkglocalstatedir=${localstatedir}
+
c
pkgdatadir=$(datadir)
+
c
pkglibdir=$(libdir)/plugins
+
c
pkglocalstatedir=${localstatedir}
else
else
-pkglocalstatedir=${localstatedir}/lib/${PACKAGE_NAME}
+cpkgdatadir=$(pkgdatadir)
+cpkglibdir=$(pkglibdir)
+cpkglocalstatedir=${localstatedir}/lib/${PACKAGE_NAME}
endif
BUILT_SOURCES = \
endif
BUILT_SOURCES = \
@@
-165,7
+167,7
@@
TESTS = $(check_PROGRAMS)
LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_srcdir)/testwrapper.sh
LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_srcdir)/testwrapper.sh
-jardir = $(pkgdatadir)/java
+jardir = $(
c
pkgdatadir)/java
pkglib_LTLIBRARIES =
pkglib_LTLIBRARIES =
@@
-184,9
+186,9
@@
AM_CPPFLAGS = \
-DPREFIX='"${prefix}"' \
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
-DLOCALSTATEDIR='"${localstatedir}"' \
-DPREFIX='"${prefix}"' \
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
-DLOCALSTATEDIR='"${localstatedir}"' \
- -DPKGLOCALSTATEDIR='"${pkglocalstatedir}"' \
- -DPLUGINDIR='"${pkglibdir}"' \
- -DPKGDATADIR='"${pkgdatadir}"'
+ -DPKGLOCALSTATEDIR='"${
c
pkglocalstatedir}"' \
+ -DPLUGINDIR='"${
c
pkglibdir}"' \
+ -DPKGDATADIR='"${
c
pkgdatadir}"'
if BUILD_WIN32
AM_CPPFLAGS += -DNOGDI
endif
if BUILD_WIN32
AM_CPPFLAGS += -DNOGDI
endif
@@
-2094,15
+2096,15
@@
install-exec-hook:
else \
$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
fi; \
else \
$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
fi; \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db;
+ $(mkinstalldirs) $(DESTDIR)$(
c
pkgdatadir)
+ $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(
c
pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \
$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \
- $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
+ $(DESTDIR)$(
c
pkgdatadir)/postgresql_default.conf;
uninstall-hook:
uninstall-hook:
- rm -f $(DESTDIR)$(pkgdatadir)/types.db;
+ rm -f $(DESTDIR)$(
c
pkgdatadir)/types.db;
rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
- rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
+ rm -f $(DESTDIR)$(
c
pkgdatadir)/postgresql_default.conf;
all-local: @PERL_BINDINGS@
all-local: @PERL_BINDINGS@