From 2b72a4a659dc38bec4812c4ef13da1d8eb3a250b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 9 Nov 1999 14:34:31 +1100 Subject: Build fixes --- Makefile.in | 7 ++----- openssh.spec | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 344210030..490cc49ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,11 +69,8 @@ install: all ln -sf ssh $(bindir)/slogin install -s -c scp $(bindir)/scp install -s -c ssh-add $(bindir)/ssh-add - if [ -z "@GNOME_ASKPASS@"] ; then - install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass - else - install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass - fi + [ -z "@GNOME_ASKPASS@"] && install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass + [ -z "@GNOME_ASKPASS@"] || install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass install -s -c ssh-agent $(bindir)/ssh-agent install -s -c ssh-keygen $(bindir)/ssh-keygen install -s -c sshd $(sbindir)/sshd diff --git a/openssh.spec b/openssh.spec index 240658451..888908a51 100644 --- a/openssh.spec +++ b/openssh.spec @@ -50,6 +50,9 @@ make rm -rf $RPM_BUILD_ROOT make install prefix="$RPM_BUILD_ROOT/usr" +install -d $RPM_BUILD_ROOT/etc/ssh +install -d $RPM_BUILD_ROOT/etc/pam.d/ +install -d $RPM_BUILD_ROOT/etc/rc.d/init.d install -m644 sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd install -m755 sshd.init.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config -- cgit v1.2.3