source: patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch@ 873009c

cyrus-sasl-2.1.

@@ -78 +78 @@
 
 framedir = /Library/Frameworks/SASL2.framework
 install-exec-local: $(INSTALLOSX)
-        @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
+        @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
           echo "********************************************************"; \
           echo "* WARNING:"; \
-          echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
+          echo "* Plugins are being installed into $(libdir)/sasl2,"; \
           echo "* but the library will look for them in $(plugindir)."; \
           echo "* You need to make sure that the plugins will eventually"; \
           echo "* be in $(plugindir) -- the easiest way is to make a"; \
-          echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
+          echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
           echo "* but this may not be appropriate for your site, so this"; \
           echo "* installation procedure won't do it for you."; \
           echo "*"; \

cyrus-sasl-2.1.

@@ -656 +656 @@
         @find $(distdir) -exec chmod o+w {} ';'
         @find $(distdir) -name CVS -print | xargs -t rm -rf
 install-exec-local: $(INSTALLOSX)
-        @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
+        @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
           echo "********************************************************"; \
           echo "* WARNING:"; \
-          echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
+          echo "* Plugins are being installed into $(libdir)/sasl2,"; \
           echo "* but the library will look for them in $(plugindir)."; \
           echo "* You need to make sure that the plugins will eventually"; \
           echo "* be in $(plugindir) -- the easiest way is to make a"; \
-          echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
+          echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
           echo "* but this may not be appropriate for your site, so this"; \
           echo "* installation procedure won't do it for you."; \
           echo "*"; \

cyrus-sasl-2.1.

@@ -904 +904 @@
   --with-pgsql=PATH       use PostgreSQL from PATH
   --with-sqlite=PATH       use SQLite from PATH
   --with-plugindir=DIR    set the directory where plugins will
-                          be found [/usr/lib/sasl2]
+                          be found [LIBDIR/sasl2]
   --with-rc4              use internal rc4 routines [yes]
   --with-dmalloc=DIR      with DMALLOC support (for test applications) [no]
   --with-sfio=DIR         with SFIO support (for smtptest/libsfsasl) [no]
@@ -11437 +11437 @@
   withval="$with_plugindir"
   plugindir=$withval
 else
-  plugindir=/usr/lib/sasl2
+  plugindir=${libdir}/sasl2
 fi;
 
 cat >>confdefs.h <<_ACEOF

cyrus-sasl-2.1.

@@ -787 +787 @@
 AC_SUBST(SASL_STATIC_LIBS)
 
 AC_ARG_WITH(plugindir, [  --with-plugindir=DIR    set the directory where plugins will
-                          be found [[/usr/lib/sasl2]] ],
+                          be found [[LIBDIR/sasl2]] ],
   plugindir=$withval,
-  plugindir=/usr/lib/sasl2)
+  plugindir=${libdir}/sasl2)
 AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
 AC_SUBST(plugindir)
 

plugins/Makefile.am

@@ -73 +73 @@
 
 common_sources = plugin_common.c plugin_common.h
 
-sasldir = $(prefix)/lib/sasl2
+sasldir = $(libdir)/sasl2
 sasl_LTLIBRARIES = @SASL_MECHS@
 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
         libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \

plugins/Makefile.in

@@ -255 +255 @@
 
 common_sources = plugin_common.c plugin_common.h
 
-sasldir = $(prefix)/lib/sasl2
+sasldir = $(libdir)/sasl2
 sasl_LTLIBRARIES = @SASL_MECHS@
 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
         libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \