[packages/cyrus-imapd] fix sievec/sieved being installed as libtool wrappers

glen glen at pld-linux.org
Thu Jul 28 12:41:41 CEST 2016


commit d0b94c59be918bc34c9099b586647f54d6abcbbe
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jul 28 13:41:36 2016 +0300

    fix sievec/sieved being installed as libtool wrappers

 cyrus-imapd-shared.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch
index b927cf2..dc01404 100644
--- a/cyrus-imapd-shared.patch
+++ b/cyrus-imapd-shared.patch
@@ -824,8 +824,8 @@
  
  distclean: clean
  	rm -f Makefile
---- cyrus-imapd-2.4.4/sieve/Makefile.in	2010-11-30 07:53:22.215288298 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//sieve/Makefile.in	2010-11-29 09:06:25.952918572 +0200
+--- cyrus-imapd-2.4.4-shared-patch//sieve/Makefile.in	2010-11-29 09:06:25.952918572 +0200
++++ cyrus-imapd-2.4.18/sieve/Makefile.in	2016-07-28 13:36:20.937139019 +0300
 @@ -44,6 +44,7 @@
  
  srcdir = @srcdir@
@@ -847,8 +847,14 @@
  COMPILE_ET = @COMPILE_ET@
  
  DEFS = @DEFS@ @LOCALDEFS@
-@@ -85,7 +87,7 @@
- 	$(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
+@@ -81,11 +83,11 @@
+ 
+ install: sievec sieved
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+-	$(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
+-	$(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 sievec $(DESTDIR)$(service_path)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 755 sieved $(DESTDIR)$(service_path)
  
  test: libsieve.la test.lo ../imap/message.lo $(DEPLIBS)
 -	$(CC) $(LDFLAGS) -o $@ $? \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cyrus-imapd.git/commitdiff/d0b94c59be918bc34c9099b586647f54d6abcbbe



More information about the pld-cvs-commit mailing list