diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.README | 3 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5381232b014f..4c83e21e5f9e 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/instsetoo_native/util/openoffice.lst.README b/instsetoo_native/util/openoffice.lst.README index 09f35cd775f0..c87cef24f85f 100644 --- a/instsetoo_native/util/openoffice.lst.README +++ b/instsetoo_native/util/openoffice.lst.README @@ -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 diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index e004ad15002f..ba5479617693 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -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 : \ |