source: patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch@ 1a625f6

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 1a625f6 was 617118d, checked in by Jim Gifford <clfs@…>, 19 years ago

r561@server (orig r559): root | 2005-06-05 02:38:49 -0700
Fixed Directory Structure
  • Property mode set to 100644
File size: 4.9 KB
RevLine 
[617118d]1diff -uNr cyrus-sasl-2.1.20-orig/Makefile.am cyrus-sasl-2.1.20/Makefile.am
2--- cyrus-sasl-2.1.20-orig/Makefile.am 2004-10-20 09:48:11.000000000 +1000
3+++ cyrus-sasl-2.1.20/Makefile.am 2004-10-25 21:37:53.780833136 +1000
4@@ -78,14 +78,14 @@
5
6 framedir = /Library/Frameworks/SASL2.framework
7 install-exec-local: $(INSTALLOSX)
8- @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
9+ @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
10 echo "********************************************************"; \
11 echo "* WARNING:"; \
12- echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
13+ echo "* Plugins are being installed into $(libdir)/sasl2,"; \
14 echo "* but the library will look for them in $(plugindir)."; \
15 echo "* You need to make sure that the plugins will eventually"; \
16 echo "* be in $(plugindir) -- the easiest way is to make a"; \
17- echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
18+ echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
19 echo "* but this may not be appropriate for your site, so this"; \
20 echo "* installation procedure won't do it for you."; \
21 echo "*"; \
22diff -uNr cyrus-sasl-2.1.20-orig/Makefile.in cyrus-sasl-2.1.20/Makefile.in
23--- cyrus-sasl-2.1.20-orig/Makefile.in 2004-10-25 06:21:09.000000000 +1000
24+++ cyrus-sasl-2.1.20/Makefile.in 2004-10-25 21:37:53.780833136 +1000
25@@ -656,14 +656,14 @@
26 @find $(distdir) -exec chmod o+w {} ';'
27 @find $(distdir) -name CVS -print | xargs -t rm -rf
28 install-exec-local: $(INSTALLOSX)
29- @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
30+ @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
31 echo "********************************************************"; \
32 echo "* WARNING:"; \
33- echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
34+ echo "* Plugins are being installed into $(libdir)/sasl2,"; \
35 echo "* but the library will look for them in $(plugindir)."; \
36 echo "* You need to make sure that the plugins will eventually"; \
37 echo "* be in $(plugindir) -- the easiest way is to make a"; \
38- echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
39+ echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
40 echo "* but this may not be appropriate for your site, so this"; \
41 echo "* installation procedure won't do it for you."; \
42 echo "*"; \
43diff -uNr cyrus-sasl-2.1.20-orig/configure cyrus-sasl-2.1.20/configure
44--- cyrus-sasl-2.1.20-orig/configure 2004-10-25 06:21:08.000000000 +1000
45+++ cyrus-sasl-2.1.20/configure 2004-10-25 21:38:31.938032360 +1000
46@@ -904,7 +904,7 @@
47 --with-pgsql=PATH use PostgreSQL from PATH
48 --with-sqlite=PATH use SQLite from PATH
49 --with-plugindir=DIR set the directory where plugins will
50- be found [/usr/lib/sasl2]
51+ be found [LIBDIR/sasl2]
52 --with-rc4 use internal rc4 routines [yes]
53 --with-dmalloc=DIR with DMALLOC support (for test applications) [no]
54 --with-sfio=DIR with SFIO support (for smtptest/libsfsasl) [no]
55@@ -11437,7 +11437,7 @@
56 withval="$with_plugindir"
57 plugindir=$withval
58 else
59- plugindir=/usr/lib/sasl2
60+ plugindir=${libdir}/sasl2
61 fi;
62
63 cat >>confdefs.h <<_ACEOF
64diff -uNr cyrus-sasl-2.1.20-orig/configure.in cyrus-sasl-2.1.20/configure.in
65--- cyrus-sasl-2.1.20-orig/configure.in 2004-10-25 06:05:13.000000000 +1000
66+++ cyrus-sasl-2.1.20/configure.in 2004-10-25 21:37:53.786832224 +1000
67@@ -787,9 +787,9 @@
68 AC_SUBST(SASL_STATIC_LIBS)
69
70 AC_ARG_WITH(plugindir, [ --with-plugindir=DIR set the directory where plugins will
71- be found [[/usr/lib/sasl2]] ],
72+ be found [[LIBDIR/sasl2]] ],
73 plugindir=$withval,
74- plugindir=/usr/lib/sasl2)
75+ plugindir=${libdir}/sasl2)
76 AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
77 AC_SUBST(plugindir)
78
79diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
80--- cyrus-sasl-2.1.20-orig/plugins/Makefile.am 2004-10-25 06:05:20.000000000 +1000
81+++ cyrus-sasl-2.1.20/plugins/Makefile.am 2004-10-25 21:37:53.786832224 +1000
82@@ -73,7 +73,7 @@
83
84 common_sources = plugin_common.c plugin_common.h
85
86-sasldir = $(prefix)/lib/sasl2
87+sasldir = $(libdir)/sasl2
88 sasl_LTLIBRARIES = @SASL_MECHS@
89 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
90 libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
91diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.in cyrus-sasl-2.1.20/plugins/Makefile.in
92--- cyrus-sasl-2.1.20-orig/plugins/Makefile.in 2004-10-25 06:21:09.000000000 +1000
93+++ cyrus-sasl-2.1.20/plugins/Makefile.in 2004-10-25 21:37:53.787832072 +1000
94@@ -255,7 +255,7 @@
95
96 common_sources = plugin_common.c plugin_common.h
97
98-sasldir = $(prefix)/lib/sasl2
99+sasldir = $(libdir)/sasl2
100 sasl_LTLIBRARIES = @SASL_MECHS@
101 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
102 libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
Note: See TracBrowser for help on using the repository browser.