dovecot-2.2: Makefile: Fixed compiling with automake 1.11.2+

dovecot at dovecot.org dovecot at dovecot.org
Sun Mar 11 12:44:38 EET 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/96e3b3ef59dc
changeset: 14229:96e3b3ef59dc
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 11 12:42:53 2012 +0200
description:
Makefile: Fixed compiling with automake 1.11.2+

diffstat:

 Makefile.am |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r d8a88e53f1e6 -r 96e3b3ef59dc Makefile.am
--- a/Makefile.am	Thu Mar 01 09:31:40 2012 +0200
+++ b/Makefile.am	Sun Mar 11 12:42:53 2012 +0200
@@ -17,11 +17,9 @@
 	update-version.sh \
 	$(conf_DATA)
 
-datafiles = \
-	dovecot-config
+noinst_DATA = dovecot-config
 
 nodist_pkginclude_HEADERS = config.h
-pkglib_DATA = $(datafiles)
 
 if MAINTAINER_MODE
 ChangeLog: .hg/dirstate
@@ -61,7 +59,7 @@
 endif
 
 install-exec-hook:
-	rm $(DESTDIR)$(pkglibdir)/dovecot-config && \
+	$(mkdir_p) $(DESTDIR)$(pkglibdir); \
 	grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
 	grep -v '^LIBDOVECOT.*_DEPS' | sed \
 	-e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \


More information about the dovecot-cvs mailing list