diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-13 10:07:39 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-13 10:07:39 +0100 |
| commit | 135d6e10a2e3dba8521be9704f841b2efcbe8671 (patch) | |
| tree | b797aeec0ec1b293a1c9560af85e6da57df92e0c | |
| parent | a8c382023711b7662665cfbcb9167b7d6f191d9c (diff) | |
use /usr/libexec to avoid conflicts of binaries in /usr/sbin
| -rw-r--r-- | mk/pkg-bottom.mk | 4 | ||||
| -rw-r--r-- | package/dovecot/Makefile | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 5d6d8cc30..1f6b642a7 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -26,7 +26,7 @@ ifneq ($(filter autotool,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ env AUTOCONF_VERSION=2.62 \ AUTOMAKE_VERSION=1.9 \ - autoreconf -vif $(MAKE_TRACE) + autoreconf -vf $(MAKE_TRACE) endif ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ @@ -79,7 +79,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) --prefix=/usr \ --datadir=/usr/share \ --mandir=/usr/share/man \ - --libexecdir=/usr/sbin \ + --libexecdir=/usr/libexec \ --localstatedir=/var \ --sysconfdir=/etc \ --disable-nls \ diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index d4acd7275..a8a6c3420 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -42,9 +42,10 @@ CONFIGURE_ARGS+= --with-notify=none \ post-install: ${INSTALL_DIR} ${IDIR_DOVECOT}/etc - ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot - ${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc + ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin + ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/libexec/dovecot ${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot/modules/{imap,lda,pop3} + ${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc $(CP) ${WRKINST}/usr/lib/dovecot/modules/*.so \ ${IDIR_DOVECOT}/usr/lib/dovecot/modules/ $(CP) ${WRKINST}/usr/lib/dovecot/modules/imap/*.so \ @@ -53,9 +54,9 @@ post-install: ${IDIR_DOVECOT}/usr/lib/dovecot/modules/lda/ $(CP) ${WRKINST}/usr/lib/dovecot/modules/pop3/*.so \ ${IDIR_DOVECOT}/usr/lib/dovecot/modules/pop3/ - $(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot/* \ - ${IDIR_DOVECOT}/usr/lib/dovecot/ - $(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot \ + $(INSTALL_BIN) ${WRKINST}/usr/libexec/dovecot/* \ + ${IDIR_DOVECOT}/usr/libexec/dovecot/ + $(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot* \ ${IDIR_DOVECOT}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk |