- (djm) Bug #467: Add a --disable-strip option to turn off stripping of
installed binaries. From mdev@idg.nl
This commit is contained in:
parent
ec201964e4
commit
7d90127291
|
@ -1,6 +1,8 @@
|
||||||
20030103
|
20030103
|
||||||
- (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
|
- (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
|
||||||
detection to configure.ac. Prompted by stevesk@
|
detection to configure.ac. Prompted by stevesk@
|
||||||
|
- (djm) Bug #467: Add a --disable-strip option to turn off stripping of
|
||||||
|
installed binaries. From mdev@idg.nl
|
||||||
|
|
||||||
20030110
|
20030110
|
||||||
- (djm) Enable new setproctitle emulation for Linux, AIX and HP/UX. More
|
- (djm) Enable new setproctitle emulation for Linux, AIX and HP/UX. More
|
||||||
|
@ -998,4 +1000,4 @@
|
||||||
save auth method before monitor_reset_key_state(); bugzilla bug #284;
|
save auth method before monitor_reset_key_state(); bugzilla bug #284;
|
||||||
ok provos@
|
ok provos@
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.2565 2003/01/12 23:04:58 djm Exp $
|
$Id: ChangeLog,v 1.2566 2003/01/13 05:55:22 djm Exp $
|
||||||
|
|
25
Makefile.in
25
Makefile.in
|
@ -1,4 +1,4 @@
|
||||||
# $Id: Makefile.in,v 1.224 2003/01/10 10:43:25 djm Exp $
|
# $Id: Makefile.in,v 1.225 2003/01/13 05:55:23 djm Exp $
|
||||||
|
|
||||||
# uncomment if you run a non bourne compatable shell. Ie. csh
|
# uncomment if you run a non bourne compatable shell. Ie. csh
|
||||||
#SHELL = @SH@
|
#SHELL = @SH@
|
||||||
|
@ -27,6 +27,7 @@ SSH_KEYSIGN=$(libexecdir)/ssh-keysign
|
||||||
RAND_HELPER=$(libexecdir)/ssh-rand-helper
|
RAND_HELPER=$(libexecdir)/ssh-rand-helper
|
||||||
PRIVSEP_PATH=@PRIVSEP_PATH@
|
PRIVSEP_PATH=@PRIVSEP_PATH@
|
||||||
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
|
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
|
||||||
|
STRIP_OPT=@STRIP_OPT@
|
||||||
|
|
||||||
PATHS= -DSSHDIR=\"$(sysconfdir)\" \
|
PATHS= -DSSHDIR=\"$(sysconfdir)\" \
|
||||||
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
|
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
|
||||||
|
@ -218,19 +219,19 @@ install-files: scard-install
|
||||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
|
||||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
|
||||||
(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
|
(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
|
||||||
$(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
|
$(INSTALL) -m 0755 $(STRIP_OPT) ssh $(DESTDIR)$(bindir)/ssh
|
||||||
$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
|
$(INSTALL) -m 0755 $(STRIP_OPT) scp $(DESTDIR)$(bindir)/scp
|
||||||
$(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
|
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add $(DESTDIR)$(bindir)/ssh-add
|
||||||
$(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent
|
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent $(DESTDIR)$(bindir)/ssh-agent
|
||||||
$(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
|
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
|
||||||
$(INSTALL) -m 0755 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan
|
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan
|
||||||
$(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd
|
$(INSTALL) -m 0755 $(STRIP_OPT) sshd $(DESTDIR)$(sbindir)/sshd
|
||||||
if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
|
if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
|
||||||
$(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
|
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \
|
||||||
fi
|
fi
|
||||||
$(INSTALL) -m 4711 -s ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
|
$(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
|
||||||
@NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp
|
@NO_SFTP@$(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
|
||||||
@NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER)
|
@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 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
|
||||||
$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.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
|
$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
|
||||||
|
|
13
configure.ac
13
configure.ac
|
@ -1,4 +1,4 @@
|
||||||
# $Id: configure.ac,v 1.99 2003/01/12 23:04:59 djm Exp $
|
# $Id: configure.ac,v 1.100 2003/01/13 05:55:23 djm Exp $
|
||||||
|
|
||||||
AC_INIT
|
AC_INIT
|
||||||
AC_CONFIG_SRCDIR([ssh.c])
|
AC_CONFIG_SRCDIR([ssh.c])
|
||||||
|
@ -1938,6 +1938,17 @@ AC_ARG_WITH(xauth,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
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
|
if test -z "$xauth_path" ; then
|
||||||
XAUTH_PATH="undefined"
|
XAUTH_PATH="undefined"
|
||||||
AC_SUBST(XAUTH_PATH)
|
AC_SUBST(XAUTH_PATH)
|
||||||
|
|
Loading…
Reference in New Issue