Browse Source

use /usr/libexec to avoid conflicts of binaries in /usr/sbin

Waldemar Brodkorb 15 years ago
parent
commit
135d6e10a2
2 changed files with 8 additions and 7 deletions
  1. 2 2
      mk/pkg-bottom.mk
  2. 6 5
      package/dovecot/Makefile

+ 2 - 2
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 \

+ 6 - 5
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