From 5d75cce2ba1aa2b6ee8c1f4ea5b1069f12336c17 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 1 Feb 2008 15:44:19 +0000 Subject: [PATCH] override this to include the API version, to fix the last remaining * docs/reference/Makefile.am (TARGET_DIR): override this to include the API version, to fix the last remaining parallel install issue between libsoup 2.2 and 2.4. #512810, Daniel Gryniewicz. svn path=/trunk/; revision=1065 --- ChangeLog | 5 +++++ docs/reference/Makefile.am | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index e6b78c1..4fe556c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-02-01 Dan Winship + * docs/reference/Makefile.am (TARGET_DIR): override this to + include the API version, to fix the last remaining parallel + install issue between libsoup 2.2 and 2.4. #512810, Daniel + Gryniewicz. + * tests/query-test.c (do_test): don't use "stdout" as a variable name; it's allowed to be a macro (and it is one on Solaris). #513602, patch from Jeff Cai. diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index c57803d..8da7422 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -60,6 +60,9 @@ GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la # include common portion ... include $(top_srcdir)/gtk-doc.make +# Override +override TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-$(SOUP_API_VERSION) + # kludges tmpl/*.sgml: -- 2.7.4