Deleted Added
sdiff udiff text old ( 218769 ) new ( 225825 )
full compact
Makefile.in (218769) Makefile.in (225825)
1# $Id: Makefile.in,v 1.320.4.1 2011/02/04 00:42:13 djm Exp $
1# $Id: Makefile.in,v 1.325 2011/08/05 20:15:18 djm Exp $
2
3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@
5
6AUTORECONF=autoreconf
7
8prefix=@prefix@
9exec_prefix=@exec_prefix@

--- 11 unchanged lines hidden (view full) ---

21
22DESTDIR=
23VPATH=@srcdir@
24SSH_PROGRAM=@bindir@/ssh
25ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
26SFTP_SERVER=$(libexecdir)/sftp-server
27SSH_KEYSIGN=$(libexecdir)/ssh-keysign
28SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
2
3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@
5
6AUTORECONF=autoreconf
7
8prefix=@prefix@
9exec_prefix=@exec_prefix@

--- 11 unchanged lines hidden (view full) ---

21
22DESTDIR=
23VPATH=@srcdir@
24SSH_PROGRAM=@bindir@/ssh
25ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
26SFTP_SERVER=$(libexecdir)/sftp-server
27SSH_KEYSIGN=$(libexecdir)/ssh-keysign
28SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
29RAND_HELPER=$(libexecdir)/ssh-rand-helper
30PRIVSEP_PATH=@PRIVSEP_PATH@
31SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
32STRIP_OPT=@STRIP_OPT@
33
34PATHS= -DSSHDIR=\"$(sysconfdir)\" \
35 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
36 -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
37 -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
38 -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \
39 -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \
40 -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
41 -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \
29PRIVSEP_PATH=@PRIVSEP_PATH@
30SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
31STRIP_OPT=@STRIP_OPT@
32
33PATHS= -DSSHDIR=\"$(sysconfdir)\" \
34 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
35 -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
36 -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
37 -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \
38 -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \
39 -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
40 -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \
42 -DSSH_RAND_HELPER=\"$(RAND_HELPER)\"
43
44CC=@CC@
45LD=@LD@
46CFLAGS=@CFLAGS@
47CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
48LIBS=@LIBS@
49SSHLIBS=@SSHLIBS@
50SSHDLIBS=@SSHDLIBS@

--- 5 unchanged lines hidden (view full) ---

56PERL=@PERL@
57SED=@SED@
58ENT=@ENT@
59XAUTH_PATH=@XAUTH_PATH@
60LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
61EXEEXT=@EXEEXT@
62MANFMT=@MANFMT@
63
41
42CC=@CC@
43LD=@LD@
44CFLAGS=@CFLAGS@
45CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
46LIBS=@LIBS@
47SSHLIBS=@SSHLIBS@
48SSHDLIBS=@SSHDLIBS@

--- 5 unchanged lines hidden (view full) ---

54PERL=@PERL@
55SED=@SED@
56ENT=@ENT@
57XAUTH_PATH=@XAUTH_PATH@
58LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
59EXEEXT=@EXEEXT@
60MANFMT=@MANFMT@
61
64INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
65INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
62TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
66
63
67TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
68
69LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
70 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
71 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
72 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
73 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
74 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
75 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
76 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \

--- 12 unchanged lines hidden (view full) ---

89 auth-chall.o auth2-chall.o groupaccess.o \
90 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
91 auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
92 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
93 auth-krb5.o \
94 auth2-gss.o gss-serv.o gss-serv-krb5.o \
95 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
96 sftp-server.o sftp-common.o \
64LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
65 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
66 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
67 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
68 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
69 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
70 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
71 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \

--- 12 unchanged lines hidden (view full) ---

84 auth-chall.o auth2-chall.o groupaccess.o \
85 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
86 auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
87 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
88 auth-krb5.o \
89 auth2-gss.o gss-serv.o gss-serv-krb5.o \
90 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
91 sftp-server.o sftp-common.o \
97 roaming_common.o roaming_serv.o
92 roaming_common.o roaming_serv.o \
93 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o
98
94
99MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
100MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
95MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
96MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
101MANTYPE = @MANTYPE@
102
103CONFIGFILES=sshd_config.out ssh_config.out moduli.out
104CONFIGFILES_IN=sshd_config ssh_config moduli
105
106PATHSUBS = \
97MANTYPE = @MANTYPE@
98
99CONFIGFILES=sshd_config.out ssh_config.out moduli.out
100CONFIGFILES_IN=sshd_config ssh_config moduli
101
102PATHSUBS = \
107 -e 's|/etc/ssh/ssh_prng_cmds|$(sysconfdir)/ssh_prng_cmds|g' \
108 -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
109 -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
110 -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
111 -e 's|/usr/libexec|$(libexecdir)|g' \
112 -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
113 -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
114 -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \
115 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
116 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
117 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
118 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
119 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
120 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
121 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
122 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \
123 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'
124
125FIXPATHSCMD = $(SED) $(PATHSUBS)
126
103 -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
104 -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
105 -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
106 -e 's|/usr/libexec|$(libexecdir)|g' \
107 -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
108 -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
109 -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \
110 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
111 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
112 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
113 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
114 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
115 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
116 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
117 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \
118 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'
119
120FIXPATHSCMD = $(SED) $(PATHSUBS)
121
127all: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
122all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
128
129$(LIBSSH_OBJS): Makefile.in config.h
130$(SSHOBJS): Makefile.in config.h
131$(SSHDOBJS): Makefile.in config.h
132
133.c.o:
134 $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
135

--- 34 unchanged lines hidden (view full) ---

170 $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
171
172sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
173 $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
174
175sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
176 $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)
177
123
124$(LIBSSH_OBJS): Makefile.in config.h
125$(SSHOBJS): Makefile.in config.h
126$(SSHDOBJS): Makefile.in config.h
127
128.c.o:
129 $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
130

--- 34 unchanged lines hidden (view full) ---

165 $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
166
167sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
168 $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
169
170sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
171 $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)
172
178ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o
179 $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
180
181# test driver for the loginrec code - not built by default
182logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
183 $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS)
184
185$(MANPAGES): $(MANPAGES_IN)
186 if test "$(MANTYPE)" = "cat"; then \
187 manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
188 else \

--- 4 unchanged lines hidden (view full) ---

193 else \
194 $(FIXPATHSCMD) $${manpage} > $@; \
195 fi
196
197$(CONFIGFILES): $(CONFIGFILES_IN)
198 conffile=`echo $@ | sed 's/.out$$//'`; \
199 $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
200
173# test driver for the loginrec code - not built by default
174logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
175 $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS)
176
177$(MANPAGES): $(MANPAGES_IN)
178 if test "$(MANTYPE)" = "cat"; then \
179 manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
180 else \

--- 4 unchanged lines hidden (view full) ---

185 else \
186 $(FIXPATHSCMD) $${manpage} > $@; \
187 fi
188
189$(CONFIGFILES): $(CONFIGFILES_IN)
190 conffile=`echo $@ | sed 's/.out$$//'`; \
191 $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
192
201ssh_prng_cmds.out: ssh_prng_cmds
202 if test ! -z "$(INSTALL_SSH_PRNG_CMDS)"; then \
203 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
204 fi
205
206# fake rule to stop make trying to compile moduli.o into a binary "moduli.o"
207moduli:
208 echo
209
210clean: regressclean
211 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
212 rm -f *.out core survey
213 (cd openbsd-compat && $(MAKE) clean)
214
215distclean: regressclean
216 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
217 rm -f *.out core opensshd.init openssh.xml
193# fake rule to stop make trying to compile moduli.o into a binary "moduli.o"
194moduli:
195 echo
196
197clean: regressclean
198 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
199 rm -f *.out core survey
200 (cd openbsd-compat && $(MAKE) clean)
201
202distclean: regressclean
203 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
204 rm -f *.out core opensshd.init openssh.xml
218 rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds
205 rm -f Makefile buildpkg.sh config.h config.status
219 rm -f survey.sh openbsd-compat/regress/Makefile *~
220 rm -rf autom4te.cache
221 (cd openbsd-compat && $(MAKE) distclean)
222 if test -d pkg ; then \
223 rm -fr pkg ; \
224 fi
225
226veryclean: distclean
227 rm -f configure config.h.in *.0
228
206 rm -f survey.sh openbsd-compat/regress/Makefile *~
207 rm -rf autom4te.cache
208 (cd openbsd-compat && $(MAKE) distclean)
209 if test -d pkg ; then \
210 rm -fr pkg ; \
211 fi
212
213veryclean: distclean
214 rm -f configure config.h.in *.0
215
216cleandir: veryclean
217
229mrproper: veryclean
230
231realclean: veryclean
232
233catman-do:
234 @for f in $(MANPAGES_IN) ; do \
235 base=`echo $$f | sed 's/\..*$$//'` ; \
236 echo "$$f -> $$base.0" ; \
237 $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \
238 >$$base.0 ; \
239 done
240
241distprep: catman-do
242 $(AUTORECONF)
243 -rm -rf autom4te.cache
244
218mrproper: veryclean
219
220realclean: veryclean
221
222catman-do:
223 @for f in $(MANPAGES_IN) ; do \
224 base=`echo $$f | sed 's/\..*$$//'` ; \
225 echo "$$f -> $$base.0" ; \
226 $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \
227 >$$base.0 ; \
228 done
229
230distprep: catman-do
231 $(AUTORECONF)
232 -rm -rf autom4te.cache
233
245install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
246install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf
247install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
234install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
235install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
236install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
248
249check-config:
250 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
251
252install-files:
253 $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
254 $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
255 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)

--- 4 unchanged lines hidden (view full) ---

260 (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
261 $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
262 $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
263 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
264 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent$(EXEEXT) $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
265 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
266 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
267 $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
237
238check-config:
239 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
240
241install-files:
242 $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
243 $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
244 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)

--- 4 unchanged lines hidden (view full) ---

249 (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
250 $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
251 $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
252 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
253 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent$(EXEEXT) $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
254 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
255 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
256 $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
268 if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
269 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper$(EXEEXT) $(DESTDIR)$(libexecdir)/ssh-rand-helper$(EXEEXT) ; \
270 fi
271 $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
272 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
273 $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT)
274 $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
275 $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
276 $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
277 $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
278 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
279 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
280 $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
281 $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
282 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
283 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
284 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
257 $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
258 $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
259 $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT)
260 $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
261 $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
262 $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
263 $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
264 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
265 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
266 $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
267 $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
268 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
269 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
270 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
285 if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \
286 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
287 fi
288 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
289 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
290 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
291 $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
292 -rm -f $(DESTDIR)$(bindir)/slogin
293 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
294 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
295 ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1

--- 7 unchanged lines hidden (view full) ---

303 else \
304 echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
305 fi
306 @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
307 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
308 else \
309 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
310 fi
271 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
272 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
273 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
274 $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
275 -rm -f $(DESTDIR)$(bindir)/slogin
276 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
277 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
278 ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1

--- 7 unchanged lines hidden (view full) ---

286 else \
287 echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
288 fi
289 @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
290 $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
291 else \
292 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
293 fi
311 @if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
312 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
313 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
314 else \
315 echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
316 fi ; \
317 fi
318 @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
319 if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
320 echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
321 mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
322 else \
323 $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
324 fi ; \
325 else \

--- 30 unchanged lines hidden (view full) ---

356 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
357 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
358 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
359 test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""
360
361uninstallall: uninstall
362 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
363 -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
294 @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
295 if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
296 echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
297 mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
298 else \
299 $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
300 fi ; \
301 else \

--- 30 unchanged lines hidden (view full) ---

332 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
333 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
334 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
335 test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""
336
337uninstallall: uninstall
338 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
339 -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
364 -rm -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds
365 -rmdir $(DESTDIR)$(sysconfdir)
366 -rmdir $(DESTDIR)$(bindir)
367 -rmdir $(DESTDIR)$(sbindir)
368 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
369 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8
370 -rmdir $(DESTDIR)$(mandir)
371 -rmdir $(DESTDIR)$(libexecdir)
372

--- 5 unchanged lines hidden (view full) ---

378 -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
379 -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
380 -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
381 -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
382 -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
383 -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
384 -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
385 -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
340 -rmdir $(DESTDIR)$(sysconfdir)
341 -rmdir $(DESTDIR)$(bindir)
342 -rmdir $(DESTDIR)$(sbindir)
343 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
344 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8
345 -rmdir $(DESTDIR)$(mandir)
346 -rmdir $(DESTDIR)$(libexecdir)
347

--- 5 unchanged lines hidden (view full) ---

353 -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
354 -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
355 -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
356 -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
357 -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
358 -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
359 -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
360 -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
386 -rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT)
387 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
388 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
389 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
390 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
391 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
392 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
393 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
394 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
361 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
362 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
363 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
364 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
365 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
366 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
367 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
368 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
395 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8
396 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
397 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
398 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
399 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
400
401tests interop-tests: $(TARGETS)
402 BUILDDIR=`pwd`; \
403 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \

--- 53 unchanged lines hidden (view full) ---

457 @$(SHELL) ./survey.sh > survey
458 @echo 'The survey results have been placed in the file "survey" in the'
459 @echo 'current directory. Please review the file then send with'
460 @echo '"make send-survey".'
461
462send-survey: survey
463 mail portable-survey@mindrot.org <survey
464
369 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
370 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
371 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
372 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
373
374tests interop-tests: $(TARGETS)
375 BUILDDIR=`pwd`; \
376 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \

--- 53 unchanged lines hidden (view full) ---

430 @$(SHELL) ./survey.sh > survey
431 @echo 'The survey results have been placed in the file "survey" in the'
432 @echo 'current directory. Please review the file then send with'
433 @echo '"make send-survey".'
434
435send-survey: survey
436 mail portable-survey@mindrot.org <survey
437
465package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
438package: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
466 if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \
467 sh buildpkg.sh; \
468 fi
469
439 if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \
440 sh buildpkg.sh; \
441 fi
442