View | Details | Raw Unified | Return to bug 318
Collapse All | Expand All

(-)/scratch/openssh-3.5p1/Makefile.in (-4 / +8 lines)
Lines 92-98 Link Here
92
92
93
FIXPATHSCMD	= $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
93
FIXPATHSCMD	= $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
94
94
95
all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
95
all: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
96
96
97
$(LIBSSH_OBJS): config.h
97
$(LIBSSH_OBJS): config.h
98
$(SSHOBJS): config.h
98
$(SSHOBJS): config.h
Lines 163-168 Link Here
163
	conffile=`echo $@ | sed 's/.out$$//'`; \
163
	conffile=`echo $@ | sed 's/.out$$//'`; \
164
	$(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
164
	$(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
165
165
166
ssh_prng_cmds.out: ssh_prng_cmds
167
	if test -n "$(INSTALL_SSH_PRNG_CMDS)"; then \
168
		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
169
	fi
170
166
clean:
171
clean:
167
	rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
172
	rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
168
	rm -f *.out core 
173
	rm -f *.out core 
Lines 198-205 Link Here
198
	$(AUTORECONF)
203
	$(AUTORECONF)
199
	(cd scard && $(MAKE) -f Makefile.in distprep)
204
	(cd scard && $(MAKE) -f Makefile.in distprep)
200
205
201
install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config
206
install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config
202
install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
207
install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
203
208
204
check-config:
209
check-config:
205
	-$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
210
	-$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
Lines 263-269 Link Here
263
		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
268
		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
264
	fi
269
	fi
265
	@if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
270
	@if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
266
		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
267
		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
271
		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
268
			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
272
			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
269
		else \
273
		else \

Return to bug 318