From 67957b91981e88139171c961de54f35cbe4e3bbc Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sun, 8 Nov 2009 18:49:37 +0100
Subject: [PATCH] Corrected install directories for headers and libraries.
---
configure.in | 13 +++++++++++++
src/lib-sieve/Makefile.am | 4 ++--
src/lib-sieve/plugins/enotify/Makefile.am | 2 +-
src/lib-sieve/plugins/environment/Makefile.am | 2 +-
src/lib-sieve/plugins/variables/Makefile.am | 2 +-
src/sieve-tools/Makefile.am | 2 --
6 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
index 6fcb8aace..c797d9cc6 100644
--- a/configure.in
+++ b/configure.in
@@ -107,6 +107,19 @@ AC_SUBST(MODULE_LIBS)
AC_SUBST(dovecot_incdir)
AC_SUBST(moduledir)
+if test "$docdir" = ""; then
+ dnl docdir supported only by autoconf v2.59c and later
+ docdir='${datadir}/doc/dovecot'
+fi
+AC_SUBST(docdir)
+
+dovecot_pkglibexecdir=$(libexecdir)/dovecot
+dovecot_pkglibdir=$(libdir)/dovecot
+dovecot_pkgincludedir=$(includedir)/dovecot
+AC_SUBST(dovecot_pkglibexecdir)
+AC_SUBST(dovecot_pkglibdir)
+AC_SUBST(dovecot_pkgincludedir)
+
AC_CONFIG_FILES([
Makefile
doc/Makefile
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index cb5f71bca..e293c39cf 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = plugins
-pkglib_LTLIBRARIES = libdovecot-sieve.la
+dovecot_pkglib_LTLIBRARIES = libdovecot-sieve.la
AM_CPPFLAGS = \
-I$(dovecot_incdir) \
@@ -139,7 +139,7 @@ headers = \
sieve.h
if INSTALL_HEADERS
- pkginc_libdir=$(pkgincludedir)/sieve
+ pkginc_libdir=$(dovecot_pkgincludedir)/sieve
pkginc_lib_HEADERS = $(headers)
else
noinst_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/enotify/Makefile.am b/src/lib-sieve/plugins/enotify/Makefile.am
index b9f600808..36cdf0022 100644
--- a/src/lib-sieve/plugins/enotify/Makefile.am
+++ b/src/lib-sieve/plugins/enotify/Makefile.am
@@ -37,7 +37,7 @@ headers = \
ext-enotify-common.h
if INSTALL_HEADERS
- pkginc_libdir=$(pkgincludedir)/sieve
+ pkginc_libdir=$(dovecot_pkgincludedir)/sieve
pkginc_lib_HEADERS = $(public_headers)
noinst_HEADERS = $(headers)
else
diff --git a/src/lib-sieve/plugins/environment/Makefile.am b/src/lib-sieve/plugins/environment/Makefile.am
index 8de676800..e761fd12d 100644
--- a/src/lib-sieve/plugins/environment/Makefile.am
+++ b/src/lib-sieve/plugins/environment/Makefile.am
@@ -22,7 +22,7 @@ headers = \
ext-environment-common.h
if INSTALL_HEADERS
- pkginc_libdir=$(pkgincludedir)/sieve
+ pkginc_libdir=$(dovecot_pkgincludedir)/sieve
pkginc_lib_HEADERS = $(public_headers)
noinst_HEADERS = $(headers)
else
diff --git a/src/lib-sieve/plugins/variables/Makefile.am b/src/lib-sieve/plugins/variables/Makefile.am
index 410fe9701..7e44e94cd 100644
--- a/src/lib-sieve/plugins/variables/Makefile.am
+++ b/src/lib-sieve/plugins/variables/Makefile.am
@@ -37,7 +37,7 @@ headers = \
ext-variables-dump.h
if INSTALL_HEADERS
- pkginc_libdir=$(pkgincludedir)/sieve
+ pkginc_libdir=$(dovecot_pkgincludedir)/sieve
pkginc_lib_HEADERS = $(public_headers)
noinst_HEADERS = $(headers)
else
diff --git a/src/sieve-tools/Makefile.am b/src/sieve-tools/Makefile.am
index dc9d393b1..ec35660db 100644
--- a/src/sieve-tools/Makefile.am
+++ b/src/sieve-tools/Makefile.am
@@ -1,5 +1,3 @@
-pkglibexecdir = $(libexecdir)/dovecot
-
SUBDIRS = debug
bin_PROGRAMS = sievec sieved sieve-test
--
GitLab