Fold URE: Linux ure/share/misc/* -> program/

...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b

3 files changed, 4 insertions, 8 deletions

diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 7571e5684ac0..c02cf299e5f8 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -17,8 +17,6 @@ ifeq (MACOSX,$(OS))
 $(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
 else ifeq (WNT,$(OS))
 $(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link))
-else
-$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure))
 endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index e31651434f35..7a64cfb225fc 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
+$(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_MISC_FOLDER)/services.rdb))
 
 $(eval $(call gb_Rdb_add_components,ure/services,\
     binaryurp/source/binaryurp \
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 7c5887ced9d9..ad0d42dd4bba 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -123,13 +123,12 @@ out.pln/cpputypes.cppumaker.flag: | out.pln
 	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \
             -O./out.pln/include/cpputypes \
             '-Tcom.sun.star.beans.Introspection;com.sun.star.beans.theIntrospection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander' \
-            $(URE_HOME)/ure-link/share/misc/types.rdb
+            $(URE_HOME)/program/types.rdb
 	touch $@
 
 out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
 	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \
-            -O./out.pln/include/types $< \
-            -X$(URE_HOME)/ure-link/share/misc/types.rdb
+            -O./out.pln/include/types $< -X$(URE_HOME)/program/types.rdb
 	touch $@
 
 
@@ -247,8 +246,7 @@ out.pln/types.mf: types.mf.template | out.pln
 out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
 	rm -rf out.pln/class/types
 	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/javamaker \
-            -O./out.pln/class/types $< \
-            -X$(URE_HOME)/ure-link/share/misc/types.rdb
+            -O./out.pln/class/types $< -X$(URE_HOME)/program/types.rdb
 	touch $@