tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

submit to automake really wanting wasaparse.hpp not .h

Browse Source
This commit is contained in:
Jean-Francois Dockes
2015-08-10 10:11:08 +02:00
parent 449d55d318
commit b884c5fd8d
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ylwrap
+6 -3
View File
@@ -42,13 +42,16 @@ for f in location.hh position.hh stack.hh; do
cmp -s "${tmpdir}"/$f "${inputdir}"/$f || cp -p "${tmpdir}"/$f "${inputdir}"
done
# Note that we'd prefer to use wasaparse.h instead of wasaparse.hpp,
# but automake generates a dist list with wasaparse.hpp, so no choice.
# Fix the include line in y.tab.c (it wants to include y.tab.h, but we already
# include it as wasaparse.h
# include it as wasaparse.hpp
(cd "${tmpdir}"; \
sed -e 's/#include "y.tab.h"//' < y.tab.c > toto; \
mv -f toto y.tab.c)
cmp -s "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp || \
cp -p "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp
cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h || \
cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h
cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp || \
cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp