diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index dd0502e63..f9799268a 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $ | 1 | # $Id: Makefile.in,v 1.340 2013/06/11 01:26:10 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -122,6 +122,8 @@ PATHSUBS = \ | |||
122 | -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' | 122 | -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' |
123 | 123 | ||
124 | FIXPATHSCMD = $(SED) $(PATHSUBS) | 124 | FIXPATHSCMD = $(SED) $(PATHSUBS) |
125 | FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \ | ||
126 | @UNSUPPORTED_ALGORITHMS@ | ||
125 | 127 | ||
126 | all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) | 128 | all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) |
127 | 129 | ||
@@ -185,9 +187,10 @@ $(MANPAGES): $(MANPAGES_IN) | |||
185 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ | 187 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ |
186 | fi; \ | 188 | fi; \ |
187 | if test "$(MANTYPE)" = "man"; then \ | 189 | if test "$(MANTYPE)" = "man"; then \ |
188 | $(FIXPATHSCMD) $${manpage} | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ | 190 | $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) | \ |
191 | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ | ||
189 | else \ | 192 | else \ |
190 | $(FIXPATHSCMD) $${manpage} > $@; \ | 193 | $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) > $@; \ |
191 | fi | 194 | fi |
192 | 195 | ||
193 | $(CONFIGFILES): $(CONFIGFILES_IN) | 196 | $(CONFIGFILES): $(CONFIGFILES_IN) |
@@ -383,15 +386,14 @@ uninstall: | |||
383 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 386 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
384 | 387 | ||
385 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c | 388 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c |
386 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 389 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress |
387 | $(CC) $(CPPFLAGS) -o $@ $? \ | 390 | [ -f `pwd`/regress/Makefile ] || \ |
388 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 391 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
392 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | ||
393 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
389 | 394 | ||
390 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | 395 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) |
391 | BUILDDIR=`pwd`; \ | 396 | BUILDDIR=`pwd`; \ |
392 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
393 | [ -f `pwd`/regress/Makefile ] || \ | ||
394 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ | ||
395 | TEST_SHELL="@TEST_SHELL@"; \ | 397 | TEST_SHELL="@TEST_SHELL@"; \ |
396 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 398 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
397 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 399 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |