From 0100627fc8fda8b3be42789972a8d9f0e339134c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 9 Jul 2000 21:29:37 +1000 Subject: - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM builds. Problem report from Gregory Leblanc --- ChangeLog | 2 ++ Makefile.in | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e22cc329..ef8d9d7f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Kevin Steves - (djm) Match prototype and function declaration for rresvport_af. Problem report from Niklas Edmundsson + - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM + builds. Problem report from Gregory Leblanc 20000708 - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from diff --git a/Makefile.in b/Makefile.in index 573b92ce6..50de2d973 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 -- cgit v1.2.3