summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in8
-rw-r--r--openssh.spec2
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 59a4d36f..657842b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
- EGD uses a socket, not a named pipe. Duh.
- Fix includes in fingerprint.c
- Fix scp progress bar bug again.
+ - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of
+ David Rankin <drankin@bohemians.lexington.ky.us>
19991118
- Merged OpenBSD CVS changes
diff --git a/Makefile.in b/Makefile.in
index 664920d1..73c4db76 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@ mandir=@mandir@
sysconfdir=@sysconfdir@
SSH_PROGRAM=@bindir@/ssh
-ASKPASS_PROGRAM=@libdir@/ssh/ssh-askpass
+ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass
CC=@CC@
PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\"
@@ -82,11 +82,11 @@ install: all
if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
install -d $(libdir) ; \
- install -d $(libdir)/ssh ; \
+ install -d $(libexecdir)/ssh ; \
if [ -z "@GNOME_ASKPASS@" ] ; then \
- install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass; \
+ install -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
else \
- install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass; \
+ install -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
fi ; \
fi
diff --git a/openssh.spec b/openssh.spec
index b9d7b568..30fef94b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -181,6 +181,6 @@ fi
%files askpass
%defattr(-,root,root)
-%attr(0755,root,root) /usr/lib/ssh/ssh-askpass
+%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass
%attr(0755,root,root) %dir /usr/lib/ssh