Revert "install:module <value>s must be mutually exclusive"

This reverts commit 768ea292, which was
completely misguided---configmgr allows oor:external values to let a "lower"
value shine through when the backend says it cannot produce a value, even when
that "lower" value comes from the same layer (as is e.g. already used in
officecfg/registry/data/org/openoffice/VCL.xcu).

Conflicts:
	postprocess/CustomTarget_registry.mk

Change-Id: Ic8f0c9c931e2c73c9bfb8fbe5a57f60ad6aebde1

officecfg/Configuration_officecfg.mk

@@ -101,7 +101,6 @@ $(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

@@ -171,11 +171,11 @@
            in that dir.
       -->
       <prop oor:name="WritePath">
-        <value install:module="notunixdesktop">$(userurl)/template</value>
+        <value>$(userurl)/template</value>
         <value install:module="unixdesktop" oor:external="com.sun.star.configuration.backend.DesktopBackend TemplatePathVariable"/>
       </prop>
-      <prop oor:name="UserPaths" install:module="unixdesktop">
-        <value>$(userurl)/template</value>
+      <prop oor:name="UserPaths">
+        <value install:module="unixdesktop">$(userurl)/template</value>
       </prop>
     </node>
     <node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">

postprocess/CustomTarget_registry.mk

@@ -331,10 +331,6 @@ 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
 ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
 endif