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 838b77f5 "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

officecfg/Configuration_officecfg.mk

@@ -101,6 +101,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Office/Paths-macosx.xcu \
 	org/openoffice/Office/Paths-unxwnt.xcu \
 	org/openoffice/Office/Paths-unixdesktop.xcu \
+	org/openoffice/Office/Paths-notunixdesktop.xcu \
 	org/openoffice/Office/Paths-internallibexttextcatdata.xcu \
 	org/openoffice/Office/Paths-externallibexttextcatdata.xcu \
 	org/openoffice/Office/Writer-cjk.xcu \

officecfg/registry/data/org/openoffice/Office/Paths.xcu

@@ -162,7 +162,7 @@
         <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
       </node>
       <!--
-           On unix check of we have a ~/Templates and use that as the write path.
+           On unix check if we have a ~/Templates and use that as the write path.
            On other platforms, or if ~/Templates doesn't exist, use the traditional
            $(userurl)/template path.
 
@@ -171,11 +171,11 @@
            in that dir.
       -->
       <prop oor:name="WritePath">
-        <value>$(userurl)/template</value>
+        <value install:module="notunixdesktop">$(userurl)/template</value>
         <value install:module="unixdesktop" oor:external="com.sun.star.configuration.backend.DesktopBackend TemplatePathVariable"/>
       </prop>
-      <prop oor:name="UserPaths">
-        <value install:module="unixdesktop">$(userurl)/template</value>
+      <prop oor:name="UserPaths" install:module="unixdesktop">
+        <value>$(userurl)/template</value>
       </prop>
     </node>
     <node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">

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