diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:19:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:36:55 +0100 |
| commit | 768ea2924680fc4beb75a782cb0faf26695fee53 (patch) | |
| tree | 3460fc37b43d4db3a1bcd6e70bf69bd9bc06be98 /postprocess/CustomTarget_registry.mk | |
| parent | 04c7f741f831d87c31b38de5f4074456ad91fb3d (diff) | |
install:module <value>s must be mutually exclusive
...so that only a single one ends up in the .xcd data. (In the given case,
introduced with 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2 "Resolves: rhbz#1065807
use xdg ~/Templates for default Template location," the duplication for the
unixdesktop case happened to be harmless, as the non-unixdesktop <value>
appeared in a block in main.xcd before the unixdesktop-specific <value>, so the
former was effectively ignored when reading main.xcd.)
Change-Id: I5199556ee3e6decaa07beb14a0503e1b5661f5df
Diffstat (limited to 'postprocess/CustomTarget_registry.mk')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 388793ec651a..ebd2afeb9bab 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -331,6 +331,10 @@ postprocess_FILES_main += \ # Inet-wnt.xcu must come after Inet.xcu postprocess_DRIVERS += ado endif +ifneq (unx,$(GUIBASE)) +postprocess_FILES_main += \ + $(postprocess_MOD)/org/openoffice/Office/Paths-notunixdesktop.xcu +endif ifeq ($(DISABLE_NEON),$(false)) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu endif |