Revert "fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters"

This reverts commit ac4e19f9085dbd0103c7336a5318aa1e55b3e3e0.

Unfortunately does not work if BUILDDIR is different from SRCDIR.

3 files changed, 35 insertions, 35 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu.in b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 4b5ec7dd2f8f..ace000205363 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu.in
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -26,7 +26,7 @@
     </node>
     <node oor:name="AutoCorrect" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autocorr" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/autocorr" oor:op="fuse"/>
       </node>
       <prop oor:name="WritePath">
         <value>$(userurl)/autocorr</value>
@@ -34,7 +34,7 @@
     </node>
     <node oor:name="AutoText" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/autotext/$(vlang)" oor:op="fuse"/>
       </node>
       <prop oor:name="WritePath">
         <value>$(userurl)/autotext</value>
@@ -52,7 +52,7 @@
     </node>
     <node oor:name="Basic" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/basic" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/basic" oor:op="fuse"/>
       </node>
       <prop oor:name="WritePath">
         <value>$(userurl)/basic</value>
@@ -60,12 +60,12 @@
     </node>
     <node oor:name="Bitmap" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/config/symbol" oor:op="fuse"/>
       </node>
     </node>
     <node oor:name="Config" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/>
       </node>
     </node>
     <node oor:name="Favorite" oor:op="fuse" oor:mandatory="true">
@@ -80,7 +80,7 @@
     </node>
     <node oor:name="Gallery" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/gallery" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/gallery" oor:op="fuse"/>
       </node>
       <prop oor:name="WritePath">
         <value>$(userurl)/gallery</value>
@@ -103,8 +103,8 @@
     </node>
     <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict" oor:op="fuse"/>
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/dict/ooo" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/dict" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/dict/ooo" oor:op="fuse"/>
       </node>
       <prop oor:name="UserPaths">
         <value>$(userurl)/wordbook</value>
@@ -112,7 +112,7 @@
     </node>
     <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/wordbook" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/wordbook" oor:op="fuse"/>
       </node>
       <prop oor:name="WritePath">
         <value>$(userurl)/wordbook</value>
@@ -135,7 +135,7 @@
     </node>
     <node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node install:module="internallibexttextcatdata" oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/fingerprint" oor:op="fuse"/>
+        <node install:module="internallibexttextcatdata" oor:name="$(insturl)/$(share_subdir_name)/fingerprint" oor:op="fuse"/>
         <node install:module="externallibexttextcatdata" oor:name="${SYSTEM_LIBEXTTEXTCAT_DATA}" oor:op="fuse"/>
       </node>
     </node>
@@ -158,7 +158,7 @@
     </node>
     <node oor:name="Template" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/template/$(vlang)" oor:op="fuse"/>
       </node>
       <prop oor:name="WritePath">
         <value>$(userurl)/template</value>
@@ -166,7 +166,7 @@
     </node>
     <node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">
       <node oor:name="InternalPaths">
-        <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/config" oor:op="fuse"/>
+        <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/>
       </node>
     </node>
     <node oor:name="UserConfig" oor:op="fuse" oor:mandatory="true">
diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
index 3861af800175..70f0f097d9f2 100644
--- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu.in
+++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
@@ -1241,12 +1241,12 @@
     <node oor:name="BackgroundImages">
       <node oor:name="1" oor:op="replace">
         <prop oor:name="Href">
-          <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/www-back/</value>
+          <value>$(inst)/$(share_subdir_name)/gallery/www-back/</value>
         </prop>
       </node>
       <node oor:name="2" oor:op="replace">
         <prop oor:name="Href">
-          <value>$(inst)/@LIBO_SHARE_FOLDER@/gallery/surface</value>
+          <value>$(inst)/$(share_subdir_name)/gallery/surface</value>
         </prop>
       </node>
       <node oor:name="3" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs.in b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 3de839b9f93e..ac9ed4593a00 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs.in
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1529,7 +1529,7 @@
             <desc>Specifies the settings of the AutoCorrect dialog.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autocorr</it>
+            <it>$(insturl)/$(share_subdir_name)/autocorr</it>
             <it>$(userurl)/autocorr</it>
           </value>
         </prop>
@@ -1539,7 +1539,7 @@
             modules.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
+            <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it>
             <it>$(userurl)/autotext</it>
           </value>
         </prop>
@@ -1555,7 +1555,7 @@
             AutoPilots.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it>
+            <it>$(insturl)/$(share_subdir_name)/basic</it>
             <it>$(userurl)/basic</it>
           </value>
         </prop>
@@ -1564,20 +1564,20 @@
             <desc>Contains the bitmap files which can be used for menu and
             toolbar icons.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol</value>
+          <value>$(insturl)/$(share_subdir_name)/config/symbol</value>
         </prop>
         <prop oor:name="Config" oor:type="xs:string" oor:nillable="false">
           <info>
             <desc>Contains the configuration files. This value cannot be changed
             through the user interface.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config</value>
+          <value>$(insturl)/$(share_subdir_name)/config</value>
         </prop>
         <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false">
           <info>
             <desc>Contains the provided dictionaries.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook</value>
+          <value>$(insturl)/$(share_subdir_name)/wordbook</value>
         </prop>
         <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false">
           <info>
@@ -1598,7 +1598,7 @@
             and multimedia files.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/gallery</it>
+            <it>$(insturl)/$(share_subdir_name)/gallery</it>
             <it>$(userurl)/gallery</it>
           </value>
         </prop>
@@ -1620,7 +1620,7 @@
             <desc>Contains the files that are necessary for the
             spellcheck.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/dict</value>
+          <value>$(insturl)/$(share_subdir_name)/dict</value>
         </prop>
         <prop oor:name="Module" oor:type="xs:string" oor:nillable="false">
           <info>
@@ -1665,8 +1665,8 @@
             sub-folders.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
+            <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it>
+            <it>$(insturl)/$(share_subdir_name)/template/common</it>
             <it>$(userurl)/template</it>
           </value>
         </prop>
@@ -1677,7 +1677,7 @@
             merged from UserConfig and from these folders.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/config</it>
+            <it>$(insturl)/$(share_subdir_name)/config</it>
           </value>
         </prop>
         <prop oor:name="UserConfig" oor:type="xs:string" oor:nillable="false">
@@ -1720,7 +1720,7 @@
             AutoCorrect dialog.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autocorr</it>
+            <it>$(insturl)/$(share_subdir_name)/autocorr</it>
             <it>$(userurl)/autocorr</it>
           </value>
         </prop>
@@ -1730,7 +1730,7 @@
             located.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
+            <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it>
             <it>$(userurl)/autotext</it>
           </value>
         </prop>
@@ -1747,7 +1747,7 @@
             the AutoPilots, are located.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/basic</it>
+            <it>$(insturl)/$(share_subdir_name)/basic</it>
             <it>$(userurl)/basic</it>
           </value>
         </prop>
@@ -1756,21 +1756,21 @@
             <desc>Specifies the default directory where the bitmap files, which
             can be used for the menu and toolbar icons, are located.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config/symbol</value>
+          <value>$(insturl)/$(share_subdir_name)/config/symbol</value>
         </prop>
         <prop oor:name="Config" oor:type="xs:string" oor:nillable="false">
           <info>
             <desc>Specifies the default directory where the configuration files
             are stored.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/config</value>
+          <value>$(insturl)/$(share_subdir_name)/config</value>
         </prop>
         <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false">
           <info>
             <desc>Specifies the default directory where the provided
             dictionaries are located.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/wordbook/$(vlang)</value>
+          <value>$(insturl)/$(share_subdir_name)/wordbook/$(vlang)</value>
         </prop>
         <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false">
           <info>
@@ -1792,7 +1792,7 @@
             multimedia files are located.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/gallery</it>
+            <it>$(insturl)/$(share_subdir_name)/gallery</it>
             <it>$(userurl)/gallery</it>
           </value>
         </prop>
@@ -1815,7 +1815,7 @@
             <desc>Specifies the default directory where the files that are
             necessary for the spellcheck are saved.</desc>
           </info>
-          <value>$(insturl)/@LIBO_SHARE_FOLDER@/dict</value>
+          <value>$(insturl)/$(share_subdir_name)/dict</value>
         </prop>
         <prop oor:name="Module" oor:type="xs:string" oor:nillable="false">
           <info>
@@ -1853,8 +1853,8 @@
             are located in folders and sub-folders.</desc>
           </info>
           <value>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
+            <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it>
+            <it>$(insturl)/$(share_subdir_name)/template/common</it>
             <it>$(userurl)/template</it>
           </value>
         </prop>