- (djm) Missing $(DESTDIR) on host-key target causing problems with RPM

builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
This commit is contained in:
Damien Miller 2000-07-09 21:29:37 +10:00
parent 8148fa3bd3
commit 0100627fc8
2 changed files with 10 additions and 8 deletions

View File

@ -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

View File

@ -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