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 /Makefile.in | |
parent | 8148fa3bd328e6d3f35a411658a3acf9b36bf30a (diff) |
- (djm) Missing $(DESTDIR) on host-key target causing problems with RPM
builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 16 |
1 files changed, 8 insertions, 8 deletions
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 | ||
152 | host-key: ssh-keygen | 152 | host-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 | ||
164 | host-key-force: ssh-keygen | 164 | host-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 | ||
168 | uninstallall: uninstall | 168 | uninstallall: uninstall |
169 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config | 169 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |