diff options
author | Damien Miller <djm@mindrot.org> | 2000-07-09 21:29:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-07-09 21:29:37 +1000 |
commit | 0100627fc8fda8b3be42789972a8d9f0e339134c (patch) | |
tree | 1a5dc59e84b80fd223c1a5ccd7c8126ab11684e3 | |
parent | 8148fa3bd328e6d3f35a411658a3acf9b36bf30a (diff) | |
download | openssh-git-0100627fc8fda8b3be42789972a8d9f0e339134c.tar.gz |
- (djm) Missing $(DESTDIR) on host-key target causing problems with RPM
builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 16 |
2 files changed, 10 insertions, 8 deletions
@@ -3,6 +3,8 @@ Kevin Steves <stevesk@sweden.hp.com> - (djm) Match prototype and function declaration for rresvport_af. Problem report from Niklas Edmundsson <nikke@ing.umu.se> + - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM + builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu> 20000708 - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from diff --git a/Makefile.in b/Makefile.in index 573b92ce..50de2d97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,20 +150,20 @@ install-files: fi host-key: ssh-keygen - if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \ - echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \ + if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ + echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ else \ - ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N "" ; \ + ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ fi ; \ - if [ -f $(sysconfdir)/ssh_host_dsa_key ] ; then \ - echo "$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ + if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ + echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ else \ - ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N "" ; \ + ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ fi ; host-key-force: ssh-keygen - ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N "" - ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N "" + ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" + ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" uninstallall: uninstall -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |