diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2018-02-13 11:14:17 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2018-02-13 11:14:17 -0800 |
| commit | 9e8dc74e7b8bb1f35fed819043da5c7841bfae97 (patch) | |
| tree | d6f27b83c561f36de4a1bcf479f54ea226cd1549 | |
| parent | fbc96c74510eaf675417390136dd09c00f696724 (diff) | |
| parent | 6d495b24fd864b1f847ce337472694b696d541ba (diff) | |
Merge branch 'fix-help2man-invocation'
Closes: Bug#762180
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4fbe66a..5da1844 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,12 @@ AC_PATH_PROG([HELP2MAN], help2man, [\${top_srcdir}/build-aux/missing help2man]) AS_IF([test "$HELP2MAN" = "\${top_srcdir}/build-aux/missing help2man"], AC_MSG_WARN(help2man: program not found: building man page will not work) ) +if test "$cross_compiling" = yes; then + FLEXexe='flex$(EXEEXT)' +else + FLEXexe='$(top_builddir)/flex$(EXEEXT)' +fi +AC_SUBST(FLEXexe) AC_PATH_PROGS([TEXI2DVI], [gtexi2dvi texi2dvi], [\${top_srcdir}/build-aux/missing texi2dvi]) AS_IF([test "$TEXI2DVI" = "\${top_srcdir}/build-aux/missing texi2dvi"], diff --git a/doc/Makefile.am b/doc/Makefile.am index 523aa97..e0ff498 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,5 +10,5 @@ CLEANFILES = *.aux *.cp *.cps *.fn *.fns *.hk *.hks *.ky *.log \ flex.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/flex.skl $(top_srcdir)/src/options.c $(top_srcdir)/src/options.h | $(FLEX) $(HELP2MAN) --name='$(PACKAGE_NAME)' --section=1 \ --source='The Flex Project' --manual='Programming' \ - --output=$@ $(FLEX) \ + --output=$@ $(FLEXexe) \ || rm -f $@ |