Attachment #204 for bug #467

View | Details | Raw Unified | Return to bug 467
Collapse All | Expand All




		fi
	]
)
STRIP_OPT=-s
AC_ARG_ENABLE(strip,
	[  --disable-strip         Disable calling strip(1) on install],
	[
		if test "x$enableval" = "xno" ; then
			STRIP_OPT=
		fi
	]
)
AC_SUBST(STRIP_OPT)

if test -z "$xauth_path" ; then
	XAUTH_PATH="undefined"




RAND_HELPER=$(libexecdir)/ssh-rand-helper
PRIVSEP_PATH=@PRIVSEP_PATH@
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
STRIP_OPT=@STRIP_OPT@

PATHS= -DSSHDIR=\"$(sysconfdir)\" \
	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \

	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
	$(INSTALL) -m 0755 $(STRIP_OPT) ssh $(DESTDIR)$(bindir)/ssh
	$(INSTALL) -m 0755 $(STRIP_OPT) scp $(DESTDIR)$(bindir)/scp
	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add $(DESTDIR)$(bindir)/ssh-add
	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent $(DESTDIR)$(bindir)/ssh-agent
	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan
	$(INSTALL) -m 0755 $(STRIP_OPT) sshd $(DESTDIR)$(sbindir)/sshd
	if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
		$(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
	fi
	$(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
	@NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
	@NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER)
	$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
	$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
	$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1

Return to bug 467

Lines 1905-1910 Link Here

(-)configure.ac.dist (+10 lines)
1905	fi	1905	fi
1906	]	1906	]
1907	)	1907	)
		1908	STRIP_OPT=-s
		1909	AC_ARG_ENABLE(strip,
		1910	[ --disable-strip Disable calling strip(1) on install],
		1911	[
		1912	if test "x$enableval" = "xno" ; then
		1913	STRIP_OPT=
		1914	fi
		1915	]
		1916	)
		1917	AC_SUBST(STRIP_OPT)
1908		1918
1909	if test -z "$xauth_path" ; then	1919	if test -z "$xauth_path" ; then
1910	XAUTH_PATH="undefined"	1920	XAUTH_PATH="undefined"

Lines 27-32 Link Here

(-)Makefile.in.dist (-11 / +12 lines)
27	RAND_HELPER=$(libexecdir)/ssh-rand-helper	27	RAND_HELPER=$(libexecdir)/ssh-rand-helper
28	PRIVSEP_PATH=@PRIVSEP_PATH@	28	PRIVSEP_PATH=@PRIVSEP_PATH@
29	SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@	29	SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
		30	STRIP_OPT=@STRIP_OPT@
30		31
31	PATHS= -DSSHDIR=\"$(sysconfdir)\" \	32	PATHS= -DSSHDIR=\"$(sysconfdir)\" \
32	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \	33	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
Lines 217-235 Link Here
217	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8	218	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
218	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)	219	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
219	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))	220	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
220	$(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh	221	$(INSTALL) -m 0755 $(STRIP_OPT) ssh $(DESTDIR)$(bindir)/ssh
221	$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp	222	$(INSTALL) -m 0755 $(STRIP_OPT) scp $(DESTDIR)$(bindir)/scp
222	$(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add	223	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add $(DESTDIR)$(bindir)/ssh-add
223	$(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent	224	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent $(DESTDIR)$(bindir)/ssh-agent
224	$(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen	225	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
225	$(INSTALL) -m 0755 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan	226	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan
226	$(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd	227	$(INSTALL) -m 0755 $(STRIP_OPT) sshd $(DESTDIR)$(sbindir)/sshd
227	if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \	228	if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
228	$(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \	229	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
229	fi	230	fi
230	$(INSTALL) -m 4711 -s ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)	231	$(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
231	@NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp	232	@NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
232	@NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER)	233	@NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER)
233	$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1	234	$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
234	$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1	235	$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
235	$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1	236	$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1