[Libreoffice-commits] core.git: odk/CustomTarget_doxygen.mk odk/CustomTarget_javadoc.mk

[Stephan Bergmann]

 odk/CustomTarget_doxygen.mk |    2 +-
 odk/CustomTarget_javadoc.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 957cebbeb33ad9df1cd878850b7f927c5faf25ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 27 18:43:56 2013 +0100

    Use PRODUCTVERSION instead of UDK_MAJOR/MINOR/MICRO in SDK HTML documentation
    
    Change-Id: I132723457e02d6b3b9fa24d7d41ac621b03ef7b1

diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 2a18fbf..a01f519 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp/ref))
 
 odkcommon_ZIPLIST += docs/cpp/ref
 
-CPPDOCREFNAME := "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference"
+CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
 
 odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \
 	registry $(if $(filter WNT,$(OS)),systools)
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 562d5c7..24f06b3 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -23,7 +23,7 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
 	$(JAVADOC) -J-Xmx120m -use -splitindex \
 		-windowtitle "Java UNO Runtime Reference" \
-		-header "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference"\
+		-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
 		-d $(dir $@) \
 		-sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \
 		-classpath $(OUTDIR)/bin/ridl.jar \