summaryrefslogtreecommitdiff
path: root/ure/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-16 11:08:32 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commitc6a73009747814513ab5a7277c211449c7378870 (patch)
tree2adc961b3c83deffcea251c41744f2626e476f38 /ure/source
parent18041138d3169d565755565bdbabd8de596b5ac7 (diff)
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to use those from <config_folders.h> instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'ure/source')
-rw-r--r--ure/source/uno.ini2
-rw-r--r--ure/source/unorc5
2 files changed, 7 insertions, 0 deletions
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
index 6c04cae9a38c..33138e497578 100644
--- a/ure/source/uno.ini
+++ b/ure/source/uno.ini
@@ -15,6 +15,8 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+# This is the uno.ini file from ure/source
+#
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java
diff --git a/ure/source/unorc b/ure/source/unorc
index 1efbfe206271..208b1d9ff96f 100644
--- a/ure/source/unorc
+++ b/ure/source/unorc
@@ -15,6 +15,11 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+# This is the unorc file from ure/source. Note that this file is
+# copied into solver, but no longer copied into the installset, but
+# used in solver only during build. The URE unorc in the installset is
+# constructed from scp stanzas in scp2/source/ooo/ure.scp.
+#
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java