diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:36:58 -0800 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:36:58 -0800 |
commit | 426e91fa66c2a2341d46f977ee351bd24ef3331c (patch) | |
tree | b4d506125335b5e5d748ac284b7239e10df96d21 /doc/Makefile.am | |
parent | 26bb2525c89ecda0b0bc7b597ec8d1b792fc8662 (diff) | |
parent | 83d5d1695a2ab1d69ea4d8e7df27146c644876fc (diff) |
Merge tag 'v2.6.0' into upstream
flex v2.6.0 release
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# gpg: Signature made Sat 05 Dec 2015 11:42:31 AM PST using RSA key ID 4F8BC9A4
# gpg: requesting key 4F8BC9A4 from hkp server pool.sks-keyservers.net
# gpg: no valid OpenPGP data found.
# gpg: Total number processed: 0
# gpg: keyserver communications error: key not found
# gpg: keyserver communications error: bad public key
# gpg: Can't check signature: public key not found
# Conflicts:
# Makefile.am
# NEWS
# autogen.sh
# configure.ac
# doc/Makefile.am
# doc/flex.texi
# examples/fastwc/mywc.c
# lib/Makefile.am
# lib/malloc.c
# lib/realloc.c
# po/POTFILES.in
# po/ca.po
# po/da.po
# po/de.po
# po/eo.po
# po/es.po
# po/fi.po
# po/fr.po
# po/ga.po
# po/hr.po
# po/ko.po
# po/nl.po
# po/pl.po
# po/pt_BR.po
# po/ro.po
# po/ru.po
# po/sr.po
# po/sv.po
# po/tr.po
# po/vi.po
# po/zh_CN.po
# po/zh_TW.po
# tests/Makefile.am
# tests/README
Diffstat (limited to 'doc/Makefile.am')
-rw-r--r-- | doc/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 0e23dca..e776c18 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,9 +23,9 @@ CLEANFILES = \ flex.vr \ flex.vrs -$(dist_man_MANS): $(top_srcdir)/main.c +$(dist_man_MANS): $(top_srcdir)/configure.ac $(top_srcdir)/src/flex.skl $(top_srcdir)/src/options.c $(top_srcdir)/src/options.h for i in $(dist_man_MANS) ; do \ $(help2man) --name='$(PACKAGE_NAME)' \ --section=`echo $$i | sed -e 's/.*\.\([^.]*\)$$/\1/'` \ - ../flex$(EXEEXT) > $$i || rm -f $$i ; \ + $(top_srcdir)/src/flex$(EXEEXT) > $$i || rm -f $$i ; \ done |