1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
$NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $
--- Makefile.in.orig 2007-04-22 10:54:10.000000000 -0400
+++ Makefile.in
@@ -241,7 +241,7 @@ AR = @AR@
AUTHPAMCRYPT = @AUTHPAMCRYPT@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/automake.fix @AUTOMAKE@
+AUTOMAKE = srcdir=${srcdir} $(SHELL) ${srcdir}/automake.fix @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -449,7 +449,7 @@ libcourierauthcommon_la_SOURCES = \
libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
libcourierauthcommon_la_LIBADD = libcourierauth.la
-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
authmoduser2.c authmoduser3.c debug.c \
courierauthdebug.h \
@@ -601,9 +601,9 @@ authdaemondprog_DEPENDENCIES = libcourie
authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
- rfc822/libencode.la numlib/libnumlib.la
+ rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS)
-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
authdaemontest_SOURCES = authdaemontest.c
authdaemontest_DEPENDENCIES = libcourierauthcommon.la
authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
@@ -1499,19 +1499,19 @@ authvchkpw.lo: authvchkpw.c vpopmail_con
preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
vpopmail_config.h:
- echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
+ echo '#include "$(vpopmail_home)/include/config.h"' >vpopmail_config.h
authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
@HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
-@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
+@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
@HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
-@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist
-@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
-@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
+@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)$(authpgsqlrc).dist
+@HAVE_AUTHPGSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
+@HAVE_AUTHPGSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
@HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
-@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist
+@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)$(authpgsqlrc).dist
@HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
@HAVE_AUTHPGSQL_FALSE@ @:
@@ -1520,19 +1520,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
@HAVE_AUTHPGSQL_FALSE@ @:
authpgsqlrc.h:
- echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
+ echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
authldaplib.lo: authldaplib.c authldaprc.h
@HAVE_LDAP_TRUE@install-authldaprc:
-@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
+@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
-@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist
-@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist
-@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
+@HAVE_LDAP_TRUE@ $(DESTDIR)$(authldaprc).dist
+@HAVE_LDAP_TRUE@ -chown $(mailuser) $(DESTDIR)$(authldaprc).dist
+@HAVE_LDAP_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
@HAVE_LDAP_TRUE@uninstall-authldaprc:
-@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist
+@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)$(authldaprc).dist
@HAVE_LDAP_FALSE@install-authldaprc:
@HAVE_LDAP_FALSE@ @:
@@ -1541,19 +1541,19 @@ authldaplib.lo: authldaplib.c authldaprc
@HAVE_LDAP_FALSE@ @:
authldaprc.h:
- echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
+ echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
authmysqllib.lo: authmysqllib.c authmysqlrc.h
@HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
-@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
+@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
@HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
-@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist
-@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
-@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
+@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)$(authmysqlrc).dist
+@HAVE_AUTHMYSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
+@HAVE_AUTHMYSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
@HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
-@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist
+@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)$(authmysqlrc).dist
@HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
@HAVE_AUTHMYSQL_FALSE@ @:
@@ -1562,27 +1562,27 @@ authmysqllib.lo: authmysqllib.c authmysq
@HAVE_AUTHMYSQL_FALSE@ @:
authmysqlrc.h:
- echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
+ echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
authpiperc.h:
- echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
+ echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
install-authdaemonrc:
- $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
+ $(mkinstalldirs) $(DESTDIR)`dirname $(authdaemonrc)` || :
sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
- $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
+ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
rm -f authdaemonrc.tmp
- -chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
- -chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
+ -chown $(mailuser) $(DESTDIR)$(authdaemonrc).dist
+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonrc).dist
uninstall-authdaemonrc:
- rm -f $(DESTDIR)@authdaemonrc@.dist
+ rm -f $(DESTDIR)$(authdaemonrc).dist
authdaemonrc.h:
- echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
- echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
+ echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
+ echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
@@ -1600,20 +1600,20 @@ authchangepwdir.h: config.status
echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
sbindir.h: config.status
- echo '#define SBINDIR "@sbindir@"' >sbindir.h
+ echo '#define SBINDIR "$(sbindir)"' >sbindir.h
pkglibdir.h: config.status
echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
packageversion.h: config.status
- echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
+ echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
pkgincludedir.h: config.status
echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
mailusergroup.h: config.status
- echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
- echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
+ echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
+ echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
dist-hook:
for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
@@ -1629,10 +1629,10 @@ install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
- chmod 750 $(DESTDIR)@authdaemonvar@
- -chown @mailuser@ $(DESTDIR)@authdaemonvar@
- -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
+ $(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
+ chmod 750 $(DESTDIR)$(authdaemonvar)
+ -chown $(mailuser) $(DESTDIR)$(authdaemonvar)
+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
@@ -1735,13 +1735,13 @@ README_authlib.html: README_authlib.html
authdaemond.o: authdaemonrc.h authdaemond.c
install-migrate: authmigrate
- @SHELL@ authmigrate
+ $(SHELL) authmigrate
install-configure:
- test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
- test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
- test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
- test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
+ test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
+ test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
+ test -f $(DESTDIR)$(authpgsqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authpgsqlrc).dist || true
+ test -f $(DESTDIR)$(authldaprc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authldaprc).dist || true
# For maintainer's use only
|
