summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-19 12:43:19 +1100
committerDamien Miller <djm@mindrot.org>1999-11-19 12:43:19 +1100
commit18ac1719687a6671242d6a001cab01d55036ef8b (patch)
treee05129c47f263dbe7fdc7c14f353cab3e456428f
parentdc9365bf8b4180fcbab32efd231d86760587be7f (diff)
- Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of
David Rankin <drankin@bohemians.lexington.ky.us>
-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 59a4d36fb..657842b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
9 - EGD uses a socket, not a named pipe. Duh. 9 - EGD uses a socket, not a named pipe. Duh.
10 - Fix includes in fingerprint.c 10 - Fix includes in fingerprint.c
11 - Fix scp progress bar bug again. 11 - Fix scp progress bar bug again.
12 - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of
13 David Rankin <drankin@bohemians.lexington.ky.us>
12 14
1319991118 1519991118
14 - Merged OpenBSD CVS changes 16 - Merged OpenBSD CVS changes
diff --git a/Makefile.in b/Makefile.in
index 664920d14..73c4db766 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@ mandir=@mandir@
7sysconfdir=@sysconfdir@ 7sysconfdir=@sysconfdir@
8 8
9SSH_PROGRAM=@bindir@/ssh 9SSH_PROGRAM=@bindir@/ssh
10ASKPASS_PROGRAM=@libdir@/ssh/ssh-askpass 10ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass
11 11
12CC=@CC@ 12CC=@CC@
13PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\" 13PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\"
@@ -82,11 +82,11 @@ install: all
82 82
83 if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \ 83 if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
84 install -d $(libdir) ; \ 84 install -d $(libdir) ; \
85 install -d $(libdir)/ssh ; \ 85 install -d $(libexecdir)/ssh ; \
86 if [ -z "@GNOME_ASKPASS@" ] ; then \ 86 if [ -z "@GNOME_ASKPASS@" ] ; then \
87 install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass; \ 87 install -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
88 else \ 88 else \
89 install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass; \ 89 install -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
90 fi ; \ 90 fi ; \
91 fi 91 fi
92 92
diff --git a/openssh.spec b/openssh.spec
index b9d7b568e..30fef94b2 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -181,6 +181,6 @@ fi
181 181
182%files askpass 182%files askpass
183%defattr(-,root,root) 183%defattr(-,root,root)
184%attr(0755,root,root) /usr/lib/ssh/ssh-askpass 184%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass
185%attr(0755,root,root) %dir /usr/lib/ssh 185%attr(0755,root,root) %dir /usr/lib/ssh
186 186