Mercurial > dovecot > core-2.2

changeset 14283:2f3c83f28dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile: Fixed dovecot-config installation
author Timo Sirainen <tss@iki.fi>
date Sun, 04 Mar 2012 15:11:20 +0200
parents d4f40b5c080c
children a743cc250208
files Makefile.am
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Sun Mar 04 14:33:00 2012 +0200
+++ b/Makefile.am	Sun Mar 04 15:11:20 2012 +0200
@@ -1,8 +1,5 @@
 aclocaldir = $(datadir)/aclocal
 
-# automake 1.11.2+ doesn't like allow using pkglib_DATA, but we really it.
-dovecotlibdir = $(libdir)/dovecot
-
 SUBDIRS = \
 	. \
 	src \
@@ -20,11 +17,7 @@
 	update-version.sh \
 	$(conf_DATA)
 
-datafiles = \
-	dovecot-config
-
 nodist_pkginclude_HEADERS = config.h
-dovecotlib_DATA = $(datafiles)
 
 if MAINTAINER_MODE
 ChangeLog: .hg/dirstate
@@ -64,7 +57,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'|" \