More build system stuff

git-svn-id: https://uriparser.svn.sourceforge.net/svnroot/uriparser/uriparser/trunk@368 119732b9-2324-0410-a8a5-815c10060bbe

3 files changed, 4 insertions, 11 deletions

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 5931161..9f9b54e 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -8,7 +8,7 @@
 ###############################################################

 

 

-PROJECT_NAME = "@PACKAGE@"

+PROJECT_NAME = "uriparser"

 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded by double-quotes) that should identify the project for which the documentation is generated. This name is used in the title of most generated pages and in a few other places.

 

 

@@ -16,7 +16,7 @@ PROJECT_NUMBER = "@VERSION@"
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This could be handy for archiving the generated documentation or if some version control system is used.

 

 

-CHM_FILE = "..\@PACKAGE@-@VERSION@-doc.chm"

+CHM_FILE = "..\@PACKAGE@-@VERSION@.chm"

 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can be used to specify the file name of the resulting .chm file. You can add a path in front of the file if the result should not be written to the html output directory.

 

 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index dcc7587..4d1290f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,13 +2,6 @@
 AUTOMAKE_OPTIONS = 1.10 foreign dist-zip no-dist-gzip

 
 

-## Nested configure hacks

-if CALLED_BY_PARENT
-else

-distdir = $(PACKAGE)-$(VERSION)-doc

-endif
-
-

 noinst_SCRIPTS = phony_html_doc

 

 phony_html_doc :

diff --git a/doc/configure.ac b/doc/configure.ac
index 8260d8a..b039bce 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -2,7 +2,7 @@
 AC_PREREQ(2.61)
 AC_INIT(Doxyfile.in)
 AC_CONFIG_AUX_DIR([../build-aux])
-AM_INIT_AUTOMAKE(uriparser, 0.7.3)
+AM_INIT_AUTOMAKE(uriparser-doc, 0.7.3)
 
 
 ## Nested configure hacks
@@ -29,7 +29,7 @@ fi
 
 ## HTML help
 host_triplet=`${ac_config_guess}`
-if grep cygwin <<<"${host_triplet}" >/dev/null ; then
+if echo "${host_triplet}" | grep cygwin &>/dev/null ; then
 	GENERATE_HTMLHELP=YES
 else
 	GENERATE_HTMLHELP=NO