summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in16
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 @@
3 Kevin Steves <stevesk@sweden.hp.com> 3 Kevin Steves <stevesk@sweden.hp.com>
4 - (djm) Match prototype and function declaration for rresvport_af. 4 - (djm) Match prototype and function declaration for rresvport_af.
5 Problem report from Niklas Edmundsson <nikke@ing.umu.se> 5 Problem report from Niklas Edmundsson <nikke@ing.umu.se>
6 - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM
7 builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
6 8
720000708 920000708
8 - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from 10 - (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:
150 fi 150 fi
151 151
152host-key: ssh-keygen 152host-key: ssh-keygen
153 if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \ 153 if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \
154 echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \ 154 echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \
155 else \ 155 else \
156 ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N "" ; \ 156 ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \
157 fi ; \ 157 fi ; \
158 if [ -f $(sysconfdir)/ssh_host_dsa_key ] ; then \ 158 if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \
159 echo "$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ 159 echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
160 else \ 160 else \
161 ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N "" ; \ 161 ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \
162 fi ; 162 fi ;
163 163
164host-key-force: ssh-keygen 164host-key-force: ssh-keygen
165 ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N "" 165 ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
166 ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N "" 166 ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
167 167
168uninstallall: uninstall 168uninstallall: uninstall
169 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config 169 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config