Kaydet (Commit) 2c1f814d authored tarafından Michael Stahl's avatar Michael Stahl

change PRODUCTNAME for --enable-dbgutil build

The previous commit changed several nodes in main.xcd from
LibreOfficeDev to LibreOffice; revert that.

Change-Id: Ib1c114a0716a6a930c52c9c9a9144154fcb3934d
üst 89ac3c4a
......@@ -12137,7 +12137,11 @@ fi
AC_SUBST(WITH_COMPAT_OOWRAPPERS)
AC_MSG_CHECKING([for product name])
PRODUCTNAME=AC_PACKAGE_NAME
if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
PRODUCTNAME=AC_PACKAGE_NAME"Dev"
else
PRODUCTNAME=AC_PACKAGE_NAME
fi
AC_MSG_RESULT([$PRODUCTNAME])
AC_SUBST(PRODUCTNAME)
......
......@@ -19,6 +19,9 @@
Some documentation for the variables specified in file openoffice.lst.
FIXME: quite a few of these variables are duplicated in
postprocess/CustomTarget_registry.mk, this needs to be consolidated
VARIABLE NAME USAGE
-------------------------------------------------------------------------------
BASISPACKAGEPREFIX name prefix for the installation packages
......
......@@ -566,9 +566,9 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-o $@.tmp $(SOLARENV)/bin/packregistry.xslt $< \
&& sed $(postprocess_main_SED) $@.tmp > $@ \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
$(SOLARENV)/bin/packregistry.xslt $< \
| sed $(postprocess_main_SED) > $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment