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 5b2431d4a..839abbd48 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@ |
@@ -125,6 +125,8 @@ PATHSUBS = \ | |||
125 | -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' | 125 | -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' |
126 | 126 | ||
127 | FIXPATHSCMD = $(SED) $(PATHSUBS) | 127 | FIXPATHSCMD = $(SED) $(PATHSUBS) |
128 | FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \ | ||
129 | @UNSUPPORTED_ALGORITHMS@ | ||
128 | 130 | ||
129 | all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) | 131 | all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) |
130 | 132 | ||
@@ -191,9 +193,10 @@ $(MANPAGES): $(MANPAGES_IN) | |||
191 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ | 193 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ |
192 | fi; \ | 194 | fi; \ |
193 | if test "$(MANTYPE)" = "man"; then \ | 195 | if test "$(MANTYPE)" = "man"; then \ |
194 | $(FIXPATHSCMD) $${manpage} | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ | 196 | $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) | \ |
197 | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ | ||
195 | else \ | 198 | else \ |
196 | $(FIXPATHSCMD) $${manpage} > $@; \ | 199 | $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) > $@; \ |
197 | fi | 200 | fi |
198 | 201 | ||
199 | $(CONFIGFILES): $(CONFIGFILES_IN) | 202 | $(CONFIGFILES): $(CONFIGFILES_IN) |
@@ -394,15 +397,14 @@ uninstall: | |||
394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 397 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
395 | 398 | ||
396 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c | 399 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c |
397 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 400 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress |
398 | $(CC) $(CPPFLAGS) -o $@ $? \ | 401 | [ -f `pwd`/regress/Makefile ] || \ |
399 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 402 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
403 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | ||
404 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
400 | 405 | ||
401 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | 406 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) |
402 | BUILDDIR=`pwd`; \ | 407 | BUILDDIR=`pwd`; \ |
403 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
404 | [ -f `pwd`/regress/Makefile ] || \ | ||
405 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ | ||
406 | TEST_SHELL="@TEST_SHELL@"; \ | 408 | TEST_SHELL="@TEST_SHELL@"; \ |
407 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 409 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
408 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 410 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |