X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=b20d7009391aa26ae178f109f08062f8b8e266b1;hp=b9b7ab89b3dbf1dc6e732ef6059ce9b008eb01bc;hb=568420ac172981edccb8587cc9651952fe350365;hpb=fe86778a8eea71062db899f9f7d6f7f79817067d diff --git a/src/Makefile.am b/src/Makefile.am index b9b7ab89..b20d7009 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -133,7 +133,7 @@ ascent_la_LDFLAGS = -module -avoid-version ascent_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) ascent_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) -collectd_LDADD += "-dlopen" apache.la +collectd_LDADD += "-dlopen" ascent.la collectd_DEPENDENCIES += ascent.la endif @@ -839,5 +839,6 @@ install-exec-hook: $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ fi; \ cp -f $(srcdir)/types.db $(DESTDIR)$(pkglibdir)/; - $(INSTALL) -D -m 0644 $(srcdir)/postgresql_default.conf \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;