diff --git a/COPYING b/COPYING index 88798ab..caeca07 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.15/COPYING \ No newline at end of file +/usr/share/automake-1.14/COPYING \ No newline at end of file diff --git a/INSTALL b/INSTALL index ddcdb76..f812f5a 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.15/INSTALL \ No newline at end of file +/usr/share/automake-1.14/INSTALL \ No newline at end of file diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 7c6a416..1badd4a 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -171,19 +171,22 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(NUMBERS) AX_SUBST(HOME) if test -f README.md; then - README=$() + README=$(tail -n +3 README.md) DESCRIPTION=$(head -1 README.md) else README=$(tail -n +3 README) DESCRIPTION=$(head -1 README) fi + README_ESCAPED=$(echo "$README" | sed ':a;N;$!ba;s/\n/\\n/g;s,",\\",g') if which pandoc 2>&1 > /dev/null; then - README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\\(.\),\\\\\1,g;s/\n/\\n/g;s,",\\",g;s, ,\ \ ,g') + README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\n,\\\\\\\\n,g;s/\n/\\n/g;s,",\\",g') else README_HTML="${README}" fi AX_SUBST(README) _AM_SUBST_NOTMAKE([README]) + AX_SUBST(README_ESCAPED) + _AM_SUBST_NOTMAKE([README_ESCAPED]) AX_SUBST(README_HTML) _AM_SUBST_NOTMAKE([README_HTML]) AX_SUBST(DESCRIPTION) @@ -197,10 +200,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ AX_SUBST(AUTHOR_NAME) AX_SUBST(AUTHOR_URL) AX_SUBST(AUTHOR_MAIL) - PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}" - SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}" - AX_SUBST(PROJECT_URL) - AX_SUBST(SOURCE_DOWNLOAD) DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) AX_SUBST(DISTRO) ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm)) diff --git a/bootstrap.sh b/bootstrap.sh index 6d65568..b69f0d8 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -569,20 +569,6 @@ if ! testtag AX_CHECK_QT && \ ! testtag AX_REQUIRE_QT; then echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \ to --condition AX_USE_CXX src/makefile.am - if ! ls src/*.[ch]xx; then - to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.hxx < #include @@ -700,8 +679,7 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} { #endif EOF - fi - to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.ui < ${PackageName} @@ -783,7 +761,7 @@ EOF to --condition AX_USE_CXX src/version.cxx <\$projectbrief @@ -947,18 +925,7 @@ to --condition AX_USE_DOXYGEN doc/style.css <