Wed Sep 4 07:09:44 PDT 2013

Rebased ref, commits from common ancestor:
commit 8843764bf4360e884d3af3585bf852cddf09bace
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 25 13:38:35 2013 +0200

    lcms2: stop delivering liblcms2.so.2.0.4
    
    Change-Id: Ie88e74f3ced7595ab4a9dfaa16c2a4ce53bd7b3c

diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index 30bf089..d132619 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -28,6 +28,5 @@ endif
 else
 $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
 $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
 endif
 # vim: set noet sw=4 ts=4:
commit 686469976db16a41ae5249f9cb727a07350b7c0f
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 25 13:37:59 2013 +0200

    gbuild: ExternalPackage: use gb_Helper_install
    
    Change-Id: I001563c8aaf4e21e57c53aa2045b6709a35464d7

diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 4491b88..7ec30cb 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -36,9 +36,6 @@ $(call gb_ExternalPackage_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),EPK,2)
 	rm -f $(call gb_ExternalPackage_get_target,$*)
 
-# Get name of the Package used for delivering files for install to $(INSTDIR).
-gb_ExternalPackage_get_packagename = ExternalPackage/$(1)
-
 # Create and register a new ExternalPackage
 #
 # The base directory of the package is the directory of the unpacked
@@ -63,8 +60,6 @@ define gb_ExternalPackage_ExternalPackage_internal
 $(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2)))
 $(call gb_Package_use_unpacked,$(1),$(2))
 
-$(call gb_ExternalPackage__ExternalPackage_package,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
-
 $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
 $(call gb_ExternalPackage_get_target,$(1)) :| $(dir $(call gb_ExternalPackage_get_target,$(1))).dir
 $(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1))
@@ -73,14 +68,6 @@ gb_ExternalPackage_UNPACKED_$(1) := $(2)
 
 endef
 
-# gb_ExternalPackage__ExternalPackage_package package inst-package unpacked
-define gb_ExternalPackage__ExternalPackage_package
-$(call gb_Package_Package_internal,$(2),$(call gb_UnpackedTarball_get_dir,$(3)))
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
-$(call gb_Package_use_unpacked,$(2),$(3))
-
-endef
-
 # Set output dir for the package's files.
 #
 # Default is $(OUTDIR).
@@ -197,20 +184,21 @@ endef
 define gb_ExternalPackage_use_external_project
 $(call gb_Package_use_external_project,$(1),$(2))
 
-$(call gb_Package_use_external_project,$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
-
 $(if $(gb_ExternalPackage_PROJECT_$(1)),$(call gb_Output_error,gb_ExternalPackage_use_external_project: only one project allowed))
 gb_ExternalPackage_PROJECT_$(1) := $(2)
 
 endef
 
-# gb_ExternalPackage__add_file_for_install package package-inst dest dest-inst src
+# gb_ExternalPackage__add_file_for_install package dest dest-inst src
 define gb_ExternalPackage__add_file_for_install
-$(call gb_ExternalPackage_add_file,$(1),$(3),$(5))
+$(call gb_ExternalPackage_add_file,$(1),$(2),$(4))
+
+$(call gb_Helper_install,$(call gb_ExternalPackage_get_target,$(1)), \
+	$(INSTDIR)/$(3), \
+	$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4))
 
-$(call gb_ExternalPackage_add_file,$(2),$(4),$(5))
-$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2))
-$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
+$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4) :| \
+	$(call gb_Package_get_preparation_target,$(1))
 
 endef
 
@@ -225,7 +213,7 @@ endef
 #
 # gb_ExternalPackage_add_library_for_install package dest src library?
 define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
 
 endef
 
@@ -245,7 +233,7 @@ endef
 #
 # gb_ExternalPackage_add_jar_for_install package dest src
 define gb_ExternalPackage_add_jar_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
 
 endef
 
commit fc7fadcf9328c9d41495fd1c7d2e006f252cbc6a
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Wed Jun 19 14:50:02 2013 +0200

    start to use instdir for subsequentcheck tests; avoid make dev-install
    
    This commit breaks linkoo.
    
    make dev-install continues to work as before but it's not necessary to
    use it anymore.
    make check now uses files copied into instdir by gbuild.
    TODO: fix remaining issues so that instdir is the same as install/.
    
    Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98

diff --git a/Makefile.in b/Makefile.in
index eef1aec..f1d5b37 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -381,7 +381,7 @@ findunusedcode:
               | grep -v ^WSObject \
               > unusedcode.easy
 
-check: dev-install subsequentcheck
+check: build subsequentcheck
 
 dump-deps:
 	@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild
@@ -389,7 +389,7 @@ dump-deps:
 dump-deps-png:
 	@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild | dot -Tpng -o lo.png
 
-subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),build)
 	$(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
 
 .PHONY : debugrun help slowcheck translations unitcheck
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 1deb99a..68acf41 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -36,10 +36,8 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_migrationoo2 \
     Library_migrationoo3 \
     Library_unopkgapp \
-    $(if $(gb_RUNNABLE_INSTDIR),\
-        Package_scripts_install \
-    ) \
     Package_scripts \
+    Package_scripts_install \
     Pagein_calc \
     Pagein_common \
     Pagein_draw \
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk
index 2ee18e5..dc9e4a5 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -17,11 +17,9 @@ $(eval $(call gb_Module_add_targets,instsetoo_native,\
 
 endif
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(eval $(call gb_Module_add_targets,instsetoo_native,\
 	CustomTarget_setup \
 	Package_setup \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 4baeb61..15e7b58 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,postprocess,\
 	CustomTarget_registry \
 	Package_images \
 	Package_registry \
+	Package_registry_install \
 	Rdb_services \
 ))
 
@@ -26,10 +27,4 @@ $(eval $(call gb_Module_add_targets,postprocess,\
 ))
 endif
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(eval $(call gb_Module_add_targets,postprocess,\
-	Package_registry_install \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index ef63bea..c3c1386 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -26,7 +26,7 @@ ifneq ($(filter-out WNT IOS ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,solenv,\
 	CustomTarget_gdb \
 	Package_gdb \
-	$(if $(gb_RUNNABLE_INSTDIR),Package_gdb_install) \
+	Package_gdb_install \
 ))
 endif
 
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index a1068a7..ae1df9d 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -464,12 +464,10 @@ define gb_AllLangResTarget_AllLangResTarget
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
 	$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
 $(call gb_Helper_install,$(call gb_AllLangResTarget_get_target,$(1)), \
 	$(call gb_ResTarget_get_install_target,$(1)$(lang)), \
 	$(call gb_ResTarget_get_target,$(1)$(lang))))
-endif
 
 $$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget)
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 0450c6f..1640cec 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -69,13 +69,11 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar
 $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_Executable_Executable_platform,$(1),$(2))
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(if $(call gb_Executable__get_dir_for_exe,$(1)), \
 $(call gb_Helper_install,$(call gb_Executable_get_target,$(1)), \
 	$(call gb_Executable_get_install_target,$(1)), \
 	$(call gb_LinkTarget_get_target,$(2))) \
 )
-endif
 $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Executable)
 $(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 1a2abef..4491b88 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -63,9 +63,7 @@ define gb_ExternalPackage_ExternalPackage_internal
 $(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2)))
 $(call gb_Package_use_unpacked,$(1),$(2))
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(call gb_ExternalPackage__ExternalPackage_package,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
-endif
 
 $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
 $(call gb_ExternalPackage_get_target,$(1)) :| $(dir $(call gb_ExternalPackage_get_target,$(1))).dir
@@ -199,9 +197,7 @@ endef
 define gb_ExternalPackage_use_external_project
 $(call gb_Package_use_external_project,$(1),$(2))
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(call gb_Package_use_external_project,$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
-endif
 
 $(if $(gb_ExternalPackage_PROJECT_$(1)),$(call gb_Output_error,gb_ExternalPackage_use_external_project: only one project allowed))
 gb_ExternalPackage_PROJECT_$(1) := $(2)
@@ -212,11 +208,9 @@ endef
 define gb_ExternalPackage__add_file_for_install
 $(call gb_ExternalPackage_add_file,$(1),$(3),$(5))
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(call gb_ExternalPackage_add_file,$(2),$(4),$(5))
 $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2))
 $(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
-endif
 
 endef
 
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 7ef7212..5f3f210 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -101,13 +101,11 @@ $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call g
 $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
 $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\
 $(call gb_Helper_install,$(call gb_Jar_get_outdir_target,$(1)), \
 	$(call gb_Jar_get_install_target,$(1)), \
 	$(call gb_Jar_get_target,$(1))) \
 )
-endif
 
 endef
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index fb0ff64..2fd559a 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -86,13 +86,11 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(if $(call gb_Library_get_instdir,$(1)),\
 $(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \
 	$(call gb_Library_get_install_target,$(1)), \
 	$(call gb_LinkTarget_get_target,$(2))) \
 )
-endif
 
 $$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
 
@@ -129,11 +127,9 @@ define gb_Library__set_soversion_script
 $(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktargetname,$(1)),$(2),$(3))
 $(call gb_Library_get_target,$(1)) : SOVERSION := $(2)
 $(call gb_Library__add_soversion_link,$(1),$(call gb_Library_get_target,$(1)).$(2))
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \
 	$(call gb_Library_get_install_target,$(1)).$(2), \
 	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2))
-endif
 
 endef
 
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index aa6a98a..e0ce242 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -47,11 +47,9 @@ $(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(cal
 $(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
 $(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(call gb_Helper_install,$(call gb_Pagein_get_outdir_target,$(1)), \
 	$(call gb_Pagein_get_install_target,$(1)), \
 	$(call gb_Pagein_get_target,$(1)))
-endif
 
 endef
 
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1c5dcfa..c38cbee 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -18,6 +18,8 @@
 #
 
 GBUILDDIR:=$(SRCDIR)/solenv/gbuild
+gb_DEVINSTALLROOT := $(INSTDIR)
+gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/)
 
 # vars needed from the env/calling makefile
 
@@ -263,10 +265,6 @@ gb_GLOBALDEFS += \
 
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
-ifeq ($(origin gb_RUNNABLE_INSTDIR),undefined)
-gb_RUNNABLE_INSTDIR :=
-endif
-
 include $(GBUILDDIR)/Deliver.mk
 
 $(eval $(call gb_Deliver_init))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index d5d7d48..fa412cc 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -327,7 +327,7 @@ gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib
 
 define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=$$($(gb_MKTEMP)) && \
-printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)" > $${OFFICESCRIPT} && \
+printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)" > $${OFFICESCRIPT} && \
 gdb -x $${OFFICESCRIPT} $(gb_DEVINSTALLROOT)/MacOS/soffice && \
 rm $${OFFICESCRIPT}
 endef
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index d9c1bb5..e3ada70 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -352,7 +352,7 @@ define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp` && \
 printf ". $(gb_DEVINSTALLROOT)/program/ooenv\\n" > $${OFFICESCRIPT} && \
 printf "gdb --tui $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \
-printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)\"" >> $${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \
 printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
 $(SHELL) $${OFFICESCRIPT} && \
 rm $${OFFICESCRIPT}
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 02ecb6c..d349a7c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -347,7 +347,7 @@ define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp` && \
 printf 'if [ -e $(gb_DEVINSTALLROOT)/program/ooenv ]; then . $(gb_DEVINSTALLROOT)/program/ooenv; fi\n' > $${OFFICESCRIPT} && \
 printf "gdb $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \
-printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)\"" >> $${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \
 $(SHELL) $${OFFICESCRIPT} && \
 rm $${OFFICESCRIPT}
 endef
commit c162c2b7b54fcb978a5b89fdf2e548674abf6fe4
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Fri Jun 21 22:29:38 2013 +0200

    properly generate rc files
    
    Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad

diff --git a/config_host.mk.in b/config_host.mk.in
index f3d379b..586e2e0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -310,6 +310,7 @@ export LIBO_LIB_FOLDER=@LIBO_LIB_FOLDER@
 export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@
 export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@
 export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
+export LIBO_SHARE_JAVA_FOLDER=@LIBO_SHARE_JAVA_FOLDER@
 export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
 export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
 export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
diff --git a/configure.ac b/configure.ac
index 89ca08f..b4df848 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2963,6 +2963,7 @@ AC_SUBST(LIBO_LIB_FOLDER)
 AC_SUBST(LIBO_LIB_PYUNO_FOLDER)
 AC_SUBST(LIBO_SHARE_FOLDER)
 AC_SUBST(LIBO_SHARE_HELP_FOLDER)
+AC_SUBST(LIBO_SHARE_JAVA_FOLDER)
 AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
 AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
 AC_SUBST(LIBO_URE_LIB_FOLDER)
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 9db1698..55624ce 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -10,11 +10,60 @@
 $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
+	$(call gb_Helper_get_rcfile,bootstrap) \
+	$(call gb_Helper_get_rcfile,fundamental) \
 	ooenv \
-	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
-	versionrc \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
+	$(call gb_Helper_get_rcfile,uno) \
+	$(call gb_Helper_get_rcfile,version) \
 ))
 
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) \
+	: $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk
+
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	( \
+		echo '[ErrorReport]' \
+		&& echo 'ErrorReportPort=80' \
+		&& echo 'ErrorReportServer=report.libreoffice.org' \
+		&& echo '[Bootstrap]' \
+		&& echo 'InstallMode=<installmode>' \
+		&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
+		&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)' \
+	) > $@
+
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	( \
+		echo '[Bootstrap]' \
+		&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
+		&& echo 'BRAND_BIN_SUBDIR=$(LIBO_BIN_FOLDER)' \
+		&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
+		&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu' \
+		&& echo 'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
+		&& echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \
+		&& echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \
+		&& echo 'BUNDLED_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS}' \
+		&& echo 'BUNDLED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS_USER}' \
+		&& echo 'SHARED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):SHARED_EXTENSIONS_USER}' \
+		&& echo 'UNO_SHARED_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_SHARED_PACKAGES_CACHE}' \
+		&& echo 'TMP_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \
+		&& echo 'UNO_USER_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}' \
+		&& echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/bin)' \
+		&& echo 'URE_MORE_JAVA_CLASSPATH_URLS=' \
+		&& echo 'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml' \
+		&& echo 'URE_OVERRIDE_JAVA_JFW_USER_DATA=$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/config/javasettings_$${_OS}_$${_ARCH}.xml' \
+		&& echo 'URE_LIB_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/lib)' \
+		&& echo 'URE_MORE_JAVA_TYPES=$$ORIGIN/classes/unoil.jar $$ORIGIN/classes/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \
+		&& echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_SERVICES} <$$ORIGIN/services>*' \
+		&& echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_TYPES}' \
+	) > $@
+
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
@@ -31,7 +80,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
 		echo 'export OOO_DISABLE_RECOVERY=1' \
 	) > $@
 
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc :
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
 		echo '[Bootstrap]' && \
@@ -42,14 +91,40 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc :
 		) \
 	) > $@
 
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/versionrc :
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	( \
+		echo '[Bootstrap]' \
+		&& echo 'PKG_BundledUnoFile=$$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call gb_Helper_get_rcfile,uno)' \
+		&& echo 'PKG_SharedUnoFile=$$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call gb_Helper_get_rcfile,uno)' \
+		&& echo 'PKG_UserUnoFile=$$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call gb_Helper_get_rcfile,uno)' \
+		&& echo 'BAK_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bak' \
+		&& echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/extensions' \
+		&& echo 'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bundled' \
+		&& echo 'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/tmp' \
+		&& echo 'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/shared' \
+		&& echo 'UNO_SHARED_PACKAGES=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/uno_packages' \
+		&& echo 'UNO_SHARED_PACKAGES_CACHE=$$UNO_SHARED_PACKAGES/cache' \
+		&& echo 'UNO_USER_PACKAGES=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/uno_packages' \
+		&& echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \
+	) > $@
+
+.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version)
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
-		echo '[Version]' && \
-		echo 'AllLanguages=en-US' && \
-		echo 'buildid=$(shell git log -1 --format=%H)' && \
-		echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' && \
-		echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \
+		echo '[Version]' \
+		&& echo 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \
+		&& echo 'BuildVersion=$(BUILD_VER_STRING)' \
+		&& echo 'buildid=$(shell git log -1 --format=%H)' \
+		&& echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \
+		&& echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \
+		&& echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \
+		&& echo 'ReferenceOOoMajorMinor=3.4' \
+		&& echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
+		&& echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
+		&& echo 'UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; BundledLanguages=$${AllLanguages})' \
+		&& echo 'Vendor=$(OOO_VENDOR)' \
 	) > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk
index 49bcb12..2ee18e5 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -20,7 +20,6 @@ endif
 ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(eval $(call gb_Module_add_targets,instsetoo_native,\
 	CustomTarget_setup \
-	Package_config \
 	Package_setup \
 ))
 endif
diff --git a/instsetoo_native/Package_config.mk b/instsetoo_native/Package_config.mk
deleted file mode 100644
index 128b653..0000000
--- a/instsetoo_native/Package_config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,instsetoo_native_config,$(SRCDIR)/instsetoo_native/config))
-
-$(eval $(call gb_Package_set_outdir,instsetoo_native_config,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,instsetoo_native_config,$(gb_PROGRAMDIRNAME),\
-	bootstraprc \
-	fundamentalrc \
-	unorc \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 03590e2..f75dc84 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -12,9 +12,12 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
 $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
+	$(call gb_Helper_get_rcfile,bootstrap) \
+	$(call gb_Helper_get_rcfile,fundamental) \
 	ooenv \
-	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
-	versionrc \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
+	$(call gb_Helper_get_rcfile,uno) \
+	$(call gb_Helper_get_rcfile,version) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/config/bootstraprc b/instsetoo_native/config/bootstraprc
deleted file mode 100644
index 09cb1fd..0000000
--- a/instsetoo_native/config/bootstraprc
+++ /dev/null
@@ -1,14 +0,0 @@
-= This file is part of the LibreOffice project.
-=
-= This Source Code Form is subject to the terms of the Mozilla Public
-= License, v. 2.0. If a copy of the MPL was not distributed with this
-= file, You can obtain one at http://mozilla.org/MPL/2.0/.
-=
-
-[ErrorReport]
-ErrorReportPort=80
-ErrorReportServer=report.libreoffice.org
-[Bootstrap]
-InstallMode=<installmode>
-ProductKey=LibreOffice 4.1
-UserInstallation=$ORIGIN/../.config
diff --git a/instsetoo_native/config/fundamentalrc b/instsetoo_native/config/fundamentalrc
deleted file mode 100644
index 9f992f2..0000000
--- a/instsetoo_native/config/fundamentalrc
+++ /dev/null
@@ -1,27 +0,0 @@
-= This file is part of the LibreOffice project.
-=
-= This Source Code Form is subject to the terms of the Mozilla Public
-= License, v. 2.0. If a copy of the MPL was not distributed with this
-= file, You can obtain one at http://mozilla.org/MPL/2.0/.
-=
-
-[Bootstrap]
-BRAND_BASE_DIR=${ORIGIN}/..
-CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu
-LO_JAVA_DIR=${BRAND_BASE_DIR}/program/classes
-LO_LIB_DIR=${BRAND_BASE_DIR}/program
-BAK_EXTENSIONS=${$ORIGIN/unorc:TMP_EXTENSIONS}
-BUNDLED_EXTENSIONS=${$ORIGIN/unorc:BUNDLED_EXTENSIONS}
-BUNDLED_EXTENSIONS_USER=${$ORIGIN/unorc:BUNDLED_EXTENSIONS_USER}
-SHARED_EXTENSIONS_USER=${$ORIGIN/unorc:SHARED_EXTENSIONS_USER}
-UNO_SHARED_PACKAGES_CACHE=${$ORIGIN/unorc:UNO_SHARED_PACKAGES_CACHE}
-TMP_EXTENSIONS=${$ORIGIN/unorc:TMP_EXTENSIONS}
-UNO_USER_PACKAGES_CACHE=${$ORIGIN/unorc:UNO_USER_PACKAGES_CACHE}
-URE_BIN_DIR=${BRAND_BASE_DIR}/ure-link/bin
-URE_MORE_JAVA_CLASSPATH_URLS=
-URE_OVERRIDE_JAVA_JFW_SHARED_DATA=${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml
-URE_OVERRIDE_JAVA_JFW_USER_DATA=${${BRAND_BASE_DIR}/program/bootstraprc:UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml
-URE_LIB_DIR=${BRAND_BASE_DIR}/ure-link/lib
-URE_MORE_JAVA_TYPES=$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}
-URE_MORE_SERVICES=${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*
-URE_MORE_TYPES=<$ORIGIN/types>* ${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_TYPES}
diff --git a/instsetoo_native/config/unorc b/instsetoo_native/config/unorc
deleted file mode 100644
index 387c4a3..0000000
--- a/instsetoo_native/config/unorc
+++ /dev/null
@@ -1,20 +0,0 @@
-= This file is part of the LibreOffice project.
-=
-= This Source Code Form is subject to the terms of the Mozilla Public
-= License, v. 2.0. If a copy of the MPL was not distributed with this
-= file, You can obtain one at http://mozilla.org/MPL/2.0/.
-=
-
-[Bootstrap]
-PKG_BundledUnoFile=$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
-PKG_SharedUnoFile=$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
-PKG_UserUnoFile=$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
-BAK_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bak
-BUNDLED_EXTENSIONS=$BRAND_BASE_DIR/share/extensions
-BUNDLED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled
-TMP_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp
-SHARED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared
-UNO_SHARED_PACKAGES=$BRAND_BASE_DIR/share/uno_packages
-UNO_SHARED_PACKAGES_CACHE=$UNO_SHARED_PACKAGES/cache
-UNO_USER_PACKAGES=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/uno_packages
-UNO_USER_PACKAGES_CACHE=$UNO_USER_PACKAGES/cache
commit 12a85038f72cde0229f6c367a10fa3bfc9f61b51
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 18 23:34:59 2013 +0200

    gbuild: avoid packages when copying files into instdir
    
    There should be only two ways how to add file into instdir:
     - gb_Helper_install used in gbuild
     - gb_Package_set_outdir used also elsewhere,
       preferably with scp2 containing its .filelist.
    
    Change-Id: I75ec0ba63f32acf4b56b17dc972f4488edf6a777

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 05ff062..1deb99a 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_migrationoo3 \
     Library_unopkgapp \
     $(if $(gb_RUNNABLE_INSTDIR),\
-        Package_pagein_install \
         Package_scripts_install \
     ) \
     Package_scripts \
diff --git a/desktop/Package_pagein_install.mk b/desktop/Package_pagein_install.mk
deleted file mode 100644
index 8a49427..0000000
--- a/desktop/Package_pagein_install.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,desktop_pagein_install,$(OUTDIR)/bin))
-
-$(eval $(call gb_Package_set_outdir,desktop_pagein_install,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,desktop_pagein_install,$(gb_PROGRAMDIRNAME),\
-    pagein-calc \
-    pagein-common \
-    pagein-draw \
-    pagein-impress \
-    pagein-writer \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 55a8d57..a1068a7 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -450,8 +450,6 @@ define gb_AllLangResTarget_set_langs
 gb_AllLangResTarget_LANGS := $(1)
 endef
 
-gb_AllLangResTarget_get_packagename = AllLangResTarget/$(1)
-
 $(call gb_AllLangResTarget_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f $(call gb_AllLangResTarget_get_target,$*))
@@ -460,19 +458,17 @@ $(call gb_AllLangResTarget_get_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && touch $@)
 
+gb_ResTarget_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/resource/$(1).res
+
 define gb_AllLangResTarget_AllLangResTarget
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
 	$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
 
 ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(call gb_Package_Package_internal,$(call gb_AllLangResTarget_get_packagename,$(1)),$(WORKDIR))
-$(call gb_Package_set_outdir,$(call gb_AllLangResTarget_get_packagename,$(1)),$(INSTDIR))
-$(call gb_AllLangResTarget_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_AllLangResTarget_get_packagename,$(1)))
-$(call gb_AllLangResTarget_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_AllLangResTarget_get_packagename,$(1)))
-$(call gb_Package_add_files,$(call gb_AllLangResTarget_get_packagename,$(1)),program/resource,\
-	$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-		$(subst $(WORKDIR)/,,$(call gb_ResTarget_get_target,$(1)$(lang)))) \
-)
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+$(call gb_Helper_install,$(call gb_AllLangResTarget_get_target,$(1)), \
+	$(call gb_ResTarget_get_install_target,$(1)$(lang)), \
+	$(call gb_ResTarget_get_target,$(1)$(lang))))
 endif
 
 $$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index e083c0d..0450c6f 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -23,8 +23,8 @@
 #  gb_Executable_Executable_platform
 
 # NOTE: SDKBIN executables are already packaged in module odk
-gb_Executable_LAYER_DIRS = \
-	OOO:$(gb_Package_PROGRAMDIRNAME) \
+gb_Executable_LAYER_DIRS := \
+	OOO:$(gb_PROGRAMDIRNAME) \
 	UREBIN:ure/bin
 
 $(dir $(call gb_Executable_get_runtime_target,%)).dir :
@@ -45,8 +45,7 @@ $(call gb_Executable_get_clean_target,%) :
 
 gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(INSTDIR)/%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS)))
 gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
-gb_Executable__get_instdir = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
-gb_Executable_get_install_target = $(if $(call gb_Executable__get_dir_for_exe,$(1)),$(call gb_Executable__get_instdir,$(1)))
+gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
 
 define gb_Executable_Executable
 $(call gb_Postprocess_register_target,AllExecutables,Executable,$(1))
@@ -67,11 +66,15 @@ $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_Executable_get_runtime_target,$(1)) :| $(dir $(call gb_Executable_get_runtime_target,$(1))).dir
 $(call gb_Executable_get_runtime_target,$(1)) : $(call gb_Executable_get_target_for_build,$(1))
 $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
-$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_install_target,$(1))
+$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_Executable_Executable_platform,$(1),$(2))
 
 ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(call gb_Helper_install,Executable,$(1),$(call gb_LinkTarget_get_target,$(2)))
+$(if $(call gb_Executable__get_dir_for_exe,$(1)), \
+$(call gb_Helper_install,$(call gb_Executable_get_target,$(1)), \
+	$(call gb_Executable_get_install_target,$(1)), \
+	$(call gb_LinkTarget_get_target,$(2))) \
+)
 endif
 $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Executable)
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 8505d76..e025cb5 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -201,15 +201,11 @@ define gb_Helper_execute
 $(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words $(1)),$(1))
 endef
 
-# define gb_Helper_install class instance-name target-to-install
+# define gb_Helper_install registered-target target-to-install target-from-workdir
 define gb_Helper_install
-ifneq (,$(call gb_$(1)_get_install_target,$(2)))
-$(call gb_$(1)_get_target,$(2)) :| $(call gb_$(1)_get_install_target,$(2))
-$(call gb_$(1)_get_install_target,$(2)) : $(3) \
-	| $(dir $(call gb_$(1)_get_install_target,$(2))).dir
-$(call gb_Deliver_add_deliverable,$(call gb_$(1)_get_install_target,$(2)),$(3),$(2))
-endif
-
+$(1) :| $(2)
+$(2) : $(3) | $(dir $(2)).dir
+$(call gb_Deliver_add_deliverable,$(2),$(3),$(2))
 endef
 
 # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 99f02d9..7ef7212 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -23,7 +23,7 @@ gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
 gb_Jar_JARCOMMAND := jar
 
 gb_Jar_LAYER_DIRS := \
-	OOO:program/classes \
+	OOO:$(gb_PROGRAMDIRNAME)/classes \
 	URE:ure/share/java
 
 # location of files going to be packed into .jar file
@@ -36,11 +36,9 @@ define gb_Jar_get_manifest_target
 $(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF
 endef
 
-gb_Jar_get_packagename = Jar/$(1)
-
 gb_Jar__get_layer = $(strip $(foreach group,$(gb_Jar_VALIDGROUPS),$(if $(filter $(1),$(gb_Jar_$(group))),$(group))))
-gb_Jar__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
-gb_Jar__get_instdir = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))
+gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(INSTDIR)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
+gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))/$(1).jar
 
 # creates classset and META-INF folders if they don't exist
 # adds manifest version, class path, solarversion and content from sources to manifest file 
@@ -105,24 +103,14 @@ $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$
 
 ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\
-	$(call gb_Jar__Jar_package,$(1),$(call gb_Jar_get_packagename,$(1)),$(notdir $(call gb_Jar_get_target,$(1)))) \
+$(call gb_Helper_install,$(call gb_Jar_get_outdir_target,$(1)), \
+	$(call gb_Jar_get_install_target,$(1)), \
+	$(call gb_Jar_get_target,$(1))) \
 )
 endif
 
 endef
 
-# gb_Jar__Jar_package jar package filename
-define gb_Jar__Jar_package
-$(call gb_Package_Package_internal,$(2),$(WORKDIR)/Jar)
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
-$(call gb_Package_add_file,$(2),$(call gb_Jar__get_instdir,$(1))/$(3),$(3))
-
-$(call gb_Package_get_target,$(2)) : $(call gb_Jar_get_target,$(1))
-$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Package_get_target,$(2))
-$(call gb_Jar_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
-
-endef
-
 # source files are forwarded to the ClassSet
 define gb_Jar_add_sourcefile
 $(call gb_JavaClassSet_add_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 95d9d2e..fb0ff64 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -30,7 +30,7 @@
 #  gb_Library_Library_platform
 
 gb_Library_LAYER_DIRS := \
-    OOO:program \
+    OOO:$(gb_PROGRAMDIRNAME) \
     URELIB:ure/$(notdir $(gb_Helper_OUTDIRLIBDIR))
 
 # doesn't do anything, just used for hooking up component target
@@ -43,10 +43,9 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
 		rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
 			$(AUXTARGETS))
 
-gb_Library_get_packagename = Library/$(1)
-
 gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS)))
 gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1)))
+gb_Library_get_install_target = $(INSTDIR)/$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))
 
 define gb_Library_Library
 $(call gb_Postprocess_register_target,AllLibraries,Library,$(1))
@@ -88,8 +87,10 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
 
 ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(if $(filter $(call gb_Library_get_layer,$(1)):%,$(gb_Library_LAYER_DIRS)),\
-    $(call gb_Library__Library_package,$(1),$(call gb_Library_get_packagename,$(1)),$(call gb_Library_get_runtime_filename,$(1))) \
+$(if $(call gb_Library_get_instdir,$(1)),\
+$(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \
+	$(call gb_Library_get_install_target,$(1)), \
+	$(call gb_LinkTarget_get_target,$(2))) \
 )
 endif
 
@@ -100,18 +101,6 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L
 
 endef
 
-# gb_Library__Library_package library package filename
-define gb_Library__Library_package
-$(call gb_Package_Package_internal,$(2),$(gb_Helper_OUTDIRLIBDIR))
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
-$(call gb_Package_add_file,$(2),$(call gb_Library_get_instdir,$(1))/$(3),$(3))
-
-$(call gb_Library__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
-$(call gb_Package_get_target,$(2)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
-
-endef
-
 # Custom definition that does not simply forward to LinkTarget,
 # because there are cases where the auxtargets are not delivered to solver...
 # The auxtarget is delivered via the rule in Package.mk.
@@ -132,17 +121,19 @@ endef
 
 # gb_Library__add_soversion_link library package linkname
 define gb_Library__add_soversion_link
-$(call gb_Library_add_auxtarget,$(1),$(3))
-ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(call gb_Package_add_file,$(2),$(call gb_Library_get_instdir,$(1))/$(notdir $(3)),$(notdir $(3)))
-endif
+$(call gb_Library_add_auxtarget,$(1),$(2))
 
 endef
 
 define gb_Library__set_soversion_script
 $(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktargetname,$(1)),$(2),$(3))
 $(call gb_Library_get_target,$(1)) : SOVERSION := $(2)
-$(call gb_Library__add_soversion_link,$(1),$(call gb_Library_get_packagename,$(1)),$(call gb_Library_get_target,$(1)).$(2))
+$(call gb_Library__add_soversion_link,$(1),$(call gb_Library_get_target,$(1)).$(2))
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \
+	$(call gb_Library_get_install_target,$(1)).$(2), \
+	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2))
+endif
 
 endef
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e1854fb..bb1569a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -606,6 +606,7 @@ define gb_LinkTarget_set_soversion_script
 $(call gb_LinkTarget_get_target,$(1)) : $(3)
 $(call gb_LinkTarget_get_target,$(1)) : SOVERSION := $(2)
 $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := $(3)
+$(call gb_LinkTarget_get_target,$(1)).$(2) : $(call gb_LinkTarget_get_target,$(1))
 
 endef
 
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index c5200b0..aa6a98a 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -36,6 +36,8 @@ $(call gb_Pagein_get_clean_target,%) :
 $(call gb_Pagein_get_target,%) :
 	$(call gb_Pagein__command,$@,$*,$^)
 	
+gb_Pagein_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
+
 define gb_Pagein_Pagein
 $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
 $(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
@@ -45,6 +47,12 @@ $(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(cal
 $(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
 $(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir
 
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(call gb_Helper_install,$(call gb_Pagein_get_outdir_target,$(1)), \
+	$(call gb_Pagein_get_install_target,$(1)), \
+	$(call gb_Pagein_get_target,$(1)))
+endif
+
 endef
 
 define gb_Pagein_add_object
commit f2a468279caaea82d24c646f366fca5b0e510837
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Wed Jun 19 13:52:44 2013 +0200

    gbuild: install rdb files directly in module they come from
    
    Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26

diff --git a/connectivity/Rdb_postgresql-sdbc.mk b/connectivity/Rdb_postgresql-sdbc.mk
index 394aa5b..7f58482 100644
--- a/connectivity/Rdb_postgresql-sdbc.mk
+++ b/connectivity/Rdb_postgresql-sdbc.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,postgresql-sdbc))
 
+$(eval $(call gb_Rdb_install,postgresql-sdbc))
+
 $(eval $(call gb_Rdb_add_components,postgresql-sdbc,\
 	connectivity/source/drivers/postgresql/postgresql-sdbc \
 	connectivity/source/drivers/postgresql/postgresql-sdbc-impl \
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk
index 7c098d3..49bcb12 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -21,7 +21,6 @@ ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(eval $(call gb_Module_add_targets,instsetoo_native,\
 	CustomTarget_setup \
 	Package_config \
-	Package_rdb \
 	Package_setup \
 ))
 endif
diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk
deleted file mode 100644
index 308bb46..0000000
--- a/instsetoo_native/Package_rdb.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,instsetoo_native_rdb,$(OUTDIR)))
-
-$(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/services,\
-	xml/services.rdb \
-	$(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
-	$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
-		$(if $(ENABLE_JAVA),\
-			$(if $(ENABLE_SCRIPTING_BEANSHELL),xml/scriptproviderforbeanshell.rdb) \
-			$(if $(ENABLE_SCRIPTING_JAVASCRIPT),xml/scriptproviderforjavascript.rdb) \
-		) \
-	) \
-))
-
-$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/types,\
-	bin/offapi.rdb \
-	bin/oovbaapi.rdb \
-))
-
-$(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/services.rdb,xml/ure/services.rdb))
-$(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/types.rdb,bin/udkapi.rdb))
-
-# vim: set noet sw=4 ts=4:
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5d1a6d9..a6884f4 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_UnoApi_UnoApi,offapi))
 
+$(eval $(call gb_UnoApi_install,offapi,$(gb_PROGRAMDIRNAME)/types/offapi.rdb))
+
 $(eval $(call gb_UnoApi_package_idlfiles,offapi))
 
 $(eval $(call gb_UnoApi_use_api,offapi,\
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index b2a44e8..ff32f15 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_UnoApi_UnoApi,oovbaapi))
 
+$(eval $(call gb_UnoApi_install,oovbaapi,$(gb_PROGRAMDIRNAME)/types/oovbaapi.rdb))
+
 $(eval $(call gb_UnoApi_use_api,oovbaapi,\
     udkapi \
     offapi \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index ef6223d..00be524 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,services))
 
+$(eval $(call gb_Rdb_install,services))
+
 $(eval $(call gb_Rdb_add_components,services,\
 	animations/source/animcore/animcore \
 	avmedia/util/avmedia \
diff --git a/pyuno/Rdb_pyuno.mk b/pyuno/Rdb_pyuno.mk
index 4d4f5cabf..71050ec 100644
--- a/pyuno/Rdb_pyuno.mk
+++ b/pyuno/Rdb_pyuno.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,pyuno))
 
+$(eval $(call gb_Rdb_install,pyuno))
+
 $(eval $(call gb_Rdb_add_components,pyuno, \
     pyuno/source/loader/pythonloader \
 ))
diff --git a/scripting/Rdb_scriptproviderforbeanshell.mk b/scripting/Rdb_scriptproviderforbeanshell.mk
index ef52d76..0a08694 100644
--- a/scripting/Rdb_scriptproviderforbeanshell.mk
+++ b/scripting/Rdb_scriptproviderforbeanshell.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,scriptproviderforbeanshell))
 
+$(eval $(call gb_Rdb_install,scriptproviderforbeanshell))
+
 $(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
 	scripting/java/ScriptProviderForBeanShell \
 ))
diff --git a/scripting/Rdb_scriptproviderforjavascript.mk b/scripting/Rdb_scriptproviderforjavascript.mk
index aec5dc6..1ac23ab 100644
--- a/scripting/Rdb_scriptproviderforjavascript.mk
+++ b/scripting/Rdb_scriptproviderforjavascript.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,scriptproviderforjavascript))
 
+$(eval $(call gb_Rdb_install,scriptproviderforjavascript))
+
 $(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
 	scripting/java/ScriptProviderForJavaScript \
 ))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 5bfa3a2..47d4d20 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -29,6 +29,8 @@ $(call gb_Rdb_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*))
 
+gb_Rdb_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
+
 define gb_Rdb_Rdb
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
 $(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \
@@ -39,6 +41,13 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),
 $(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_target,$(1)))
 endef
 
+define gb_Rdb_install
+$(call gb_Helper_install,$(call gb_Rdb_get_outdir_target,$(1)), \
+	$(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb_get_install_target,$(1))), \
+	$(call gb_Rdb_get_target,$(1)))
+
+endef
+
 define gb_Rdb_add_component
 $(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 6cadaf9..3739530 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -37,6 +37,14 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
 
 endef
 
+define gb_UnoApi_install
+$(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.))
+$(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \
+	$(INSTDIR)/$(2), \
+	$(call gb_UnoApiTarget_get_target,$(1)))
+
+endef
+
 ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
 
 # Create a package of IDL files for putting into SDK.
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 8a89327..391e334 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_UnoApi_UnoApi,udkapi))
 
+$(eval $(call gb_UnoApi_install,udkapi,$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb))
+
 $(eval $(call gb_UnoApi_package_idlfiles,udkapi))
 
 $(eval $(call gb_UnoApi_set_include,udkapi,\
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index bc88139..ba172a7 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,ure/services))
 
+$(eval $(call gb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
+
 $(eval $(call gb_Rdb_add_components,ure/services,\
 	$(if $(filter IOS,$(OS)),, \
         io/source/acceptor/acceptor \
commit 400876ab76f1f4b184278cbb65a3cac169fd828e
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Wed Jun 19 11:50:43 2013 +0200

    scp2: a little cleaning
    
    Change-Id: I4b41f8c2c6dd82956cb2493676c9854744eecbad

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 27d9bab..d6dcd18 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -170,8 +170,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
     scp2/source/ooo/module_help_template \
     scp2/source/ooo/module_hidden_ooo \
     scp2/source/ooo/module_lang_template \
-    scp2/source/ooo/ooo_brand \
-    scp2/source/ooo/profile_ooo \
     scp2/source/ooo/profileitem_ooo \
     scp2/source/ooo/scpaction_ooo \
     scp2/source/ooo/shortcut_ooo \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6f546cc..2630741 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -821,6 +821,15 @@ End
 
 // ProfileItems
 
+ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
+    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "ErrorReport";
+    Order = 8;
+    Key = "ErrorReportServer";
+    Value = "report.libreoffice.org";
+End
+
 ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 36d6522..ded453f 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -18,6 +18,18 @@
 
 #include "macros.inc"
 
+#ifndef MACOSX
+Directory gid_Dir_Brand_Root
+    ParentID = PREDEFINED_PROGDIR;
+  #ifdef WNT
+    HostName = "${WINDOWSBASISROOTNAME}";
+  #else
+    HostName = ".";
+  #endif
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
+End
+#endif
+
 #ifdef MACOSX
 Directory gid_Dir_Bundle_Contents_Resources
     ParentID = gid_Dir_Bundle_Contents;
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
deleted file mode 100644
index 1f8b536..0000000
--- a/scp2/source/ooo/ooo_brand.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-#ifndef MACOSX
-Directory gid_Dir_Brand_Root
-    ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${WINDOWSBASISROOTNAME}";
-  #else
-    HostName = ".";
-  #endif
-    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
-End
-#endif
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "ErrorReport";
-    Order = 8;
-    Key = "ErrorReportServer";
-    Value = "report.libreoffice.org";
-End
-
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
deleted file mode 100644
index a5bb3e8..0000000
--- a/scp2/source/ooo/profile_ooo.scp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-Profile gid_Profile_Uno_Ini
-    ModuleID = gid_Module_Root;
-    Name = PROFILENAME(uno);
-    Dir = GID_BRAND_DIR_ETC;
-    Styles = (NETWORK);
-End
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 5709a73..0611a63 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -20,6 +20,13 @@
 
 #include "config_folders.h"
 
+Profile gid_Profile_Uno_Ini
+    ModuleID = gid_Module_Root;
+    Name = PROFILENAME(uno);
+    Dir = GID_BRAND_DIR_ETC;
+    Styles = (NETWORK);
+End
+
 ProfileItem gid_Profileitem_Setup_Uno_Services
     ProfileID = gid_Profile_Setup_Ini;
     ModuleID = gid_Module_Root;
commit 3e311cf3e207a0f41b628c154eac0db66f5104e2
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 18 20:42:24 2013 +0200

    install soffice script into instdir
    
    Change-Id: Id55fc6efcd957de926df79ca02200f4fda7c56b0

diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index 00e149c..757c681 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
 
-$(eval $(call gb_Package_add_file,desktop_soffice_sh,bin/soffice,soffice.sh))
+$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh))
 
 # vim:set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3dedd0b..6f546cc 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -509,6 +509,17 @@ End
 
 #endif
 
+#if !defined MACOSX && !defined WNT
+
+File gid_Brand_File_Bin_Soffice
+    BIN_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "desktop_soffice_sh.filelist";
+    Styles = (FILELIST, PACKED);
+End
+
+#else
+
 File gid_Brand_File_Bin_Soffice
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -522,6 +533,8 @@ File gid_Brand_File_Bin_Soffice
 #endif
 End
 
+#endif
+
 #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
 File gid_Brand_File_Bin_Spadmin
     BIN_FILE_BODY;
commit a65ea1a6258137fbc461c532399df3b5a19c79a7
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 18 19:31:49 2013 +0200

    replace variables in main.xcd already in gbuild
    
    In main.xcd we have some variables which used to be defined mostly
    in instsetoo_native/util/openoffice.lst and replaced in installer.
    Process the file in custom target,
    so we can copy correct main.xcd directly with gbuild.
    
    Change-Id: Ie2b1b6da1adb161394f69c345bbe8671cfafb7c4

diff --git a/config_host.mk.in b/config_host.mk.in
index e5e1953..f3d379b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -318,6 +318,8 @@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
 export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
 export LIBO_VERSION_PATCH=@LIBO_VERSION_PATCH@
+export LIBO_VERSION_SUFFIX=@LIBO_VERSION_SUFFIX@
+export LIBO_VERSION_SUFFIX_SUFFIX=@LIBO_VERSION_SUFFIX_SUFFIX@
 export LIBPNG_CFLAGS=$(gb_SPACE)@LIBPNG_CFLAGS@
 export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@
 export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index ec596118..e004ad1 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -546,19 +546,32 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(l
 # Rules
 #
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.xcd : \
+postprocess_main_SED := \
+	-e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
+	-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \
+	-e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
+	-e 's,$${FILEFORMATNAME},OpenOffice.org,g' \
+	-e 's,$${FILEFORMATVERSION},1.0,g' \
+	-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(OOO_VENDOR),The Document Foundation),g' \
+	-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
+	-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
+	-e 's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
+	-e 's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \
+	-e 's,$${STARTCENTER_INFO_URL},http://www.libreoffice.org/,g' \
+	-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
+	-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
+	-e 's,$${WRITERCOMPATIBILITYVERSIONOOO11},OpenOffice.org 1.1,g' \
+
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ \
-		$(SOLARENV)/bin/packregistry.xslt $< \
+	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
+		-o $@.tmp $(SOLARENV)/bin/packregistry.xslt $< \
+	&& sed $(postprocess_main_SED) $@.tmp > $@ \
 	)
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
-	echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$*.xcu)</filename></list>' > $@
-
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : \
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
 	$(call gb_Helper_abbreviate_dirs, \
@@ -566,6 +579,10 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : \
 		-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
 	)
 
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
+	echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$*.xcu)</filename></list>' > $@
+
 # It can happen that localized fcfg_langpack_*.zip contains
 # zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the
 # find shell command below (see issue 110041):
@@ -577,14 +594,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
 		&& echo '</list>' >> $@ \
 	)
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.xcd : \
-        | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
-	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-		-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
-	)
-
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
 	echo '<list>' > $@ \
@@ -601,14 +610,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
 	) \
 	&& echo '</list>' >> $@
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \
-        | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
-	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-		-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
-	)
-
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
 	echo '<list>' $(foreach i,$(postprocess_DEPS_$*), '<dependency file="$i"/>') \
commit 174fe161df271aa19ec5d16bebcba1b82fe42aff
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 18 16:14:18 2013 +0200

    pyuno: another filelist to make instdir better
    
    Change-Id: Ieda9b3847de3de8989eaafc542e60216baa1af4d

diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index 6aed55a..306e243 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
 
-$(eval $(call gb_Package_add_file,python_shell,bin/pyuno/python,python.sh))
+$(eval $(call gb_Package_set_outdir,python_shell,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,python_shell,$(gb_Package_PROGRAMDIRNAME)/python,python.sh))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index fee4cdf..85c0a8e 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -59,9 +59,9 @@ End
 #ifndef SYSTEM_PYTHON
 File gid_File_Py_Bin_Python
     BIN_FILE_BODY;
-    Name = EXENAME(pyuno/python);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
+    Name = "python_shell.filelist";
+    Dir = FILELIST_DIR;
+    Styles = (FILELIST, PACKED);
 End
 
 #ifndef MACOSX
commit a050e3d69eca709fc8ac43f7e3b8c7f375b48bd9
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 18 16:08:14 2013 +0200

    pyuno: this rc file seems to be unused
    
    Change-Id: I98b6263a464b46075e69e363c3eb9e4ec4557c46

diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 8a6667b..a91c58b 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -14,7 +14,6 @@ ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Module_add_targets,pyuno,\
     Library_pyuno \
     Library_pythonloader \
-    Package_pyunorc \
     Package_python_scripts \
     Rdb_pyuno \
 ))
diff --git a/pyuno/Package_pyunorc.mk b/pyuno/Package_pyunorc.mk
deleted file mode 100644
index d7cedec..0000000
--- a/pyuno/Package_pyunorc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,pyuno_pyunorc,$(SRCDIR)/pyuno/source/module))
-
-$(eval $(call gb_Package_add_file,pyuno_pyunorc,$(call gb_Helper_get_rcfile,bin/pyuno),pyuno))
-
-# vim: set noet sw=4 ts=4:
diff --git a/pyuno/source/module/pyuno b/pyuno/source/module/pyuno
deleted file mode 100644
index 4cc6570..0000000
--- a/pyuno/source/module/pyuno
+++ /dev/null
@@ -1,21 +0,0 @@
-# The bootstrap variable PYUNOLIBDIR will be set by the pyuno runtime library
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-PYUNO_BINPATH=$PYUNOLIBDIR/../bin$UPDMINOREXT
-UNO_TYPES=$PYUNO_BINPATH/types.rdb
-UNO_SERVICES=$PYUNO_BINPATH/pyuno_services.rdb
commit af24c7872d68d90a61698b8ec53aaca667198d7d
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Tue Jun 18 11:14:23 2013 +0200

    install whole sdk using filelists
    
    Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 6908f2c..ccbb93f 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,odk,\
 	Package_odk_headers_generated \
 	Package_settings \
 	Package_settings_generated \
+	Package_share_readme \
 	PackageSet_odk_headers \
 ))
 
diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk
index 4a3199c..d1b5360 100644
--- a/odk/Package_lib.mk
+++ b/odk/Package_lib.mk
@@ -25,4 +25,14 @@ $(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\
 	$(if $(filter LINUX,$(OS)),$(notdir $(call gb_StaticLibrary_get_target,salcpprt))) \
 ))
 
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
+define odk_add_sybolic_link
+$(call gb_Package_add_symbolic_link,odk_lib,$(gb_Package_SDKDIRNAME)/lib/$(1),../../ure-link/lib/$(1).3)
+
+endef
+
+$(foreach lib,cppu cppuhelper purpenvhelper sal salhelper,\
+$(eval $(call odk_add_sybolic_link,$(notdir $(call gb_Library_get_target,$(lib))))))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
new file mode 100644
index 0000000..5128d6b
--- /dev/null
+++ b/odk/Package_share_readme.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_share_readme,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_share_readme,$(gb_Package_SDKDIRNAME)/share/readme,\
+	LICENSE.html \
+	osl/$(gb_LICENSE) \
+	osl/$(call gb_README,en-US) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 13b731e..a16becc 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -15,15 +15,8 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme)
 # what we need here is: gb_WITH_LANG_OR_DEFAULT ;-)
 readlicense_oo_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
-ifneq ($(OS),WNT)
-readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/README_$(lang))
-readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/README_%
-else
-readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/readme_$(lang).txt)
-readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/readme_%.txt
-endif
-
-$(call gb_CustomTarget_get_target,readlicense_oo/readme) : $(readlicense_oo_READMEs)
+$(call gb_CustomTarget_get_target,readlicense_oo/readme) : \
+	$(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/$(call gb_README,$(lang)))
 
 ifeq ($(strip $(gb_WITH_LANG)),)
 readlicense_oo_README_XRM := $(SRCDIR)/readlicense_oo/docs/readme.xrm
@@ -48,7 +41,11 @@ $(readlicense_oo_DIR)/readme.xrm : \
 
 endif
 
-$(readlicense_oo_README_PATTERN) : \
+readlicense_oo_README_SED := \
+	-e 's,$${PRODUCTNAME},LibreOffice,g' \
+	-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g' \
+
+$(readlicense_oo_DIR)/$(call gb_README,%) : \
 		$(SRCDIR)/readlicense_oo/docs/readme.xsl \
 		$(readlicense_oo_README_XRM) \
 		| $(readlicense_oo_DIR)/.dir \
@@ -62,13 +59,13 @@ $(readlicense_oo_README_PATTERN) : \
 			--stringparam os1 $(OS) \
 			--stringparam type text \
 			$< \
-			$(readlicense_oo_README_XRM) && \
-		$(if $(filter WNT,$(OS)) \
-			,$(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp && \
-				mv $@.tmp $@ && \
-				rm $@.out \
-			,mv $@.out $@ \
+			$(readlicense_oo_README_XRM) \
+		$(if $(filter WNT,$(OS)), \
+			&& $(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp \
+			&& mv $@.tmp $@.out \
 		) \
+		&& sed $(readlicense_oo_README_SED) $@.out > $@ \
+		&& rm $@.out \
 	)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 6cd804e..89f5ae3 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -10,12 +10,15 @@
 $(eval $(call gb_Module_Module,readlicense_oo))
 
 $(eval $(call gb_Module_add_targets,readlicense_oo,\
-    CustomTarget_license \
     CustomTarget_readme \
     Package_files \
-    Package_license \
     Package_readme \
 ))
-
+ifeq (WNT,$(OS))
+$(eval $(call gb_Module_add_targets,readlicense_oo,\
+    CustomTarget_license \
+    Package_license \
+))
+endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index f3f146b..ad35b59 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
 # LICENSE (upper case) is copied without EOL conversion from license.txt
 # license.txt is converted, prior to copy, see Package_license.mk
 $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE,txt/license.txt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/ure/LICENSE,txt/license.txt))
 
 $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE))
 
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index cdc3b15..9b460d9 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -10,6 +10,5 @@
 $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
 
 $(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt))
-$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/ure/license.txt,license.txt))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 83be8fe..6e3d58d 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -29,82 +29,17 @@ Installation gid_Installation_Sdk
 #endif
 End
 
-#if defined MACOSX
-
-Directory gid_Dir_Basis_Sdk
-    ParentID = PREDEFINED_PROGDIR;
-    DosName = "LibreOffice${PRODUCTVERSION}_SDK";
-End
-
-#elif defined WNT
-
-Directory gid_Dir_Sdkoo_Root
-    ParentID = PREDEFINED_PROGDIR;
-    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
-    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
-End
-
-Directory gid_Dir_Basis_Sdk
-    ParentID = gid_Dir_Sdkoo_Root;
-    DosName = "sdk";
-End
-
-#else
-
-Directory gid_Dir_Basis_Sdk
-    ParentID = PREDEFINED_PROGDIR;
-    DosName = "sdk";
-End
-
-#endif
-
-Directory gid_Dir_Share_Sdk
-    ParentID = gid_Dir_Basis_Sdk;
-    DosName = "share";
-End
-
-Directory gid_Dir_Share_Readme_Sdk
-    ParentID = gid_Dir_Share_Sdk;
-    DosName = "readme";
-End
-
-
 Module gid_Module_Root_SDK
     Name = "sdkoo";
     Description = "sdkoo";
     PackageInfo = "packinfo_sdkoo.txt";
 End
 
-
-File gid_File_Txt_License
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "LICENSE";
-  #endif
-  #ifdef WNT
-    Name = "license.txt";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Html_License
+File gid_File_Pakage_odk_share_readme
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-    Name = "LICENSE.html";
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Txt_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "README_en-US";
-  #endif
-  #ifdef WNT
-    Name = "readme_en-US.txt";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_share_readme.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
 File gid_File_Package_odk_bin
@@ -253,62 +188,3 @@ File gid_File_Zip_uno_loader_classes
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Directory gid_Dir_Lib_Sdk    
-    Styles = (CREATE);
-    ParentID = gid_Dir_Basis_Sdk;
-    DosName = "lib";
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Sal_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_NORMAL("sal");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Salhelper_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Cppu_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Cppuhelper_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-End
-#endif
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index c9adf88..327d847 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -11,6 +11,8 @@ gb_AWK := awk
 gb_YACC := bison
 
 gb_CLASSPATHSEP := :
+gb_LICENSE := LICENSE
+gb_README = README_$(1)
 
 # use CC/CXX if they are nondefaults
 ifneq ($(origin CC),default)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 6eb84ed..6e21aa1 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -8,6 +8,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+gb_LICENSE := license.txt
+gb_README = readme_$(1).txt
+
 gb_Helper_get_rcfile = $(1).ini
 
 gb_Helper_LIBRARY_PATH_VAR := PATH
commit 54e595e89f9b15fc064f20c2a791f6ff9fa41ca5
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Mon Jun 17 17:24:41 2013 +0200

    ure: install files with filelists
    
    This commit adds gb_Package_add_symbolic_link.
    
    Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index a669fd5..9db1698 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 	ooenv \
 	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
-	ure-link \
 	versionrc \
 ))
 
@@ -43,13 +42,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc :
 		) \
 	) > $@
 
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link :
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LN ,1)
-	rm -f $@ && \
-	mkdir -p $(dir $@)/ure && \
-	cd $(dir $@) && \
-	ln -s ure ure-link
-
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/versionrc :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index b2a2c99..03590e2 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -17,6 +17,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
 	versionrc \
 ))
 
-$(eval $(call gb_Package_add_file,instsetoo_native_setup,ure-link,ure-link))
-
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index b21e7a2..27d9bab 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -175,7 +175,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
     scp2/source/ooo/profileitem_ooo \
     scp2/source/ooo/scpaction_ooo \
     scp2/source/ooo/shortcut_ooo \
-    scp2/source/ooo/ure_into_ooo \
     $(if $(filter WNTGCC,$(OS)$(COM)),\
 		scp2/source/ooo/mingw_dlls \
 	) \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3430b77..96c7aa9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -20,6 +20,31 @@
 
 #include "AutoInstall/ure"
 
+#ifndef MACOSX
+Directory gid_Dir_Common_Ure
+  #ifdef WNT
+    ParentID = gid_Dir_Brand_Root;
+  #else
+    ParentID = PREDEFINED_PROGDIR;
+  #endif
+  #ifdef WNT
+    HostName = "URE";
+  #else
+    HostName = "ure";
+  #endif
+    Styles = (UREDIRECTORY);
+End
+#endif
+
+#if defined MACOSX
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+Directory gid_Dir_UreLink
+    ParentID = gid_Dir_Bundle_Contents;
+    DosName = "ure-link";
+End
+#endif
+#endif
+
 #if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
 Directory gid_Dir_Ure_Bin
@@ -67,26 +92,12 @@ End
 
 #endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
-// Public Executables:
-
-#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Shortcut gid_Shortcut_Exe_Uno
-    FileID = gid_File_Exe_StartupSh;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(uno);
-    Styles = (RELATIVE);
-End
-#endif
-
-// Private Executables:
-
-#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-File gid_File_Exe_StartupSh
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = "/ure/startup.sh";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE";
+#if defined WNT
+File gid_File_UreLink
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Brand_Root;
+    Name = "ure-link";
+    Styles = (PACKED);
 End
 #endif
 
@@ -263,11 +274,11 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
 #endif
 End
 
-File gid_File_Dl_Profile_Jvmfwk3rc
+File gid_File_ure_install
     TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = PROFILENAME(/ure/jvmfwk3);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Dir = FILELIST_DIR;
+    Name = ure_install.filelist;
+    Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38";
 End
 
@@ -629,7 +640,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_ThirdpartylicensereadmeHtml_Ure,
             gid_File_Readme_Ure,
             gid_File_License_Ure,
-            gid_File_Exe_StartupSh,
             gid_File_Dl_Cli_Uno,
             gid_File_Dl_Cli_Ure_Assembly,
             gid_File_Dl_Policy_Cli_Ure_Assembly,
@@ -659,7 +669,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Uno,
             gid_Unixlink_File_Dl_Rmcxt,
             gid_File_Dl_JrepropertiesClass,
-            gid_File_Dl_Profile_Jvmfwk3rc,
+            gid_File_ure_install,
             gid_File_Dl_Jpipe,
             gid_File_Dl_Jpipx,
             gid_File_Dl_Libxml2,
@@ -678,8 +688,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Misc_TypesRdb,
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
-    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
-                 gid_Unixlink_Dl_JavaUno,
+    Unixlinks = (gid_Unixlink_Dl_JavaUno,
                  gid_Unixlink_File_Dl_Sal,
                  gid_Unixlink_File_Dl_Salhelper,
                  gid_Unixlink_File_Dl_Cppu,
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
deleted file mode 100644
index 70c48d9..0000000
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-#ifndef MACOSX
-Directory gid_Dir_Common_Ure
-  #ifdef WNT
-    ParentID = gid_Dir_Brand_Root;
-  #else
-    ParentID = PREDEFINED_PROGDIR;
-  #endif
-  #ifdef WNT
-    HostName = "URE";
-  #else
-    HostName = "ure";
-  #endif
-    Styles = (UREDIRECTORY);
-End
-#endif
-
-#if defined WNT
-File gid_File_UreLink
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Brand_Root;
-    Name = "ure-link";
-    Styles = (PACKED);
-End
-#elif defined MACOSX
-#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Directory gid_Dir_UreLink
-    ParentID = gid_Dir_Bundle_Contents;
-    DosName = "ure-link";
-End
-#endif
-#else
-Unixlink gid_Unixlink_UreLink
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = "ure-link";
-    Dir = gid_Dir_Brand_Root;
-    Target = "ure";
-End
-#endif
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 2a1fd53..606bca3 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -135,6 +135,18 @@ gb_Package_OUTDIR_$(1) := $(2)
 
 endef
 
+define gb_Package_add_symbolic_link
+$(call gb_Package__check,$(1))
+$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_symbolic_link requires 3 arguments))
+$(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
+$$(gb_Package_OUTDIR_$(1))/$(2) : $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
+	rm -f $$@ && ln -s $(3) $$@
+
+$(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
+
+endef
+
 define gb_Package_add_file
 $(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments))
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 2a48f32..88cbc71 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -10,9 +10,8 @@
 $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
-    Package_distribution \
-	$(if $(gb_RUNNABLE_INSTDIR),Package_install) \
-    Rdb_ure \
+	Package_install \
+	Rdb_ure \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk
deleted file mode 100644
index dd65277..0000000
--- a/ure/Package_distribution.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,ure_distribution,$(SRCDIR)/ure/source))
-
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/README,README))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/THIRDPARTYLICENSEREADME.html,THIRDPARTYLICENSEREADME.html))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3.ini,jvmfwk3.ini))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3rc,jvmfwk3rc))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/startup.sh,startup.sh))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/uno.ini,uno.ini))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/unorc,unorc))
-
-# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index de48dd4..af4454d 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -11,8 +11,20 @@ $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
 
 $(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR)))
 
+ifneq (WNT,$(OS))
 $(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh))
-$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,jvmfwk3),jvmfwk3rc))
-$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,uno),unorc))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,ure/bin/uno,startup.sh))
+endif
+
+ifeq (MACOSX,$(OS))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link/bin/urelibs,../lib))
+else ifneq (WNT,$(OS))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure))
+endif
+
+$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_LIB_FOLDER),\
+	$(call gb_Helper_get_rcfile,jvmfwk3) \
+	$(call gb_Helper_get_rcfile,uno) \
+))
 
 # vim:set noet sw=4 ts=4:
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
old mode 100644
new mode 100755
commit 2e43adb01ff413ec3a9db8d89ddf4a70837972c2
Author: MatÃºÅ¡ Kukan <matus.kukan at gmail.com>
Date:   Mon Jun 17 16:37:01 2013 +0200

    jvmfwk: install also into instdir
    
    Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7

diff --git a/config_host.mk.in b/config_host.mk.in
index 3b586af..e5e1953 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -313,6 +313,7 @@ export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
 export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
 export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
 export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
+export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
 export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
diff --git a/configure.ac b/configure.ac
index fd840d3..89ca08f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2966,6 +2966,7 @@ AC_SUBST(LIBO_SHARE_HELP_FOLDER)
 AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
 AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
 AC_SUBST(LIBO_URE_LIB_FOLDER)
+AC_SUBST(LIBO_URE_SHARE_FOLDER)
 AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)
 
 dnl ===================================================================
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 5114487..00fd9c5 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -12,31 +12,21 @@ $(eval $(call gb_Module_Module,jvmfwk))
 ifeq ($(ENABLE_JAVA),TRUE)
 
 $(eval $(call gb_Module_add_targets,jvmfwk,\
-    Library_jvmfwk \
-    Package_rcfiles \
-))
-
-$(eval $(call gb_Module_add_targets,jvmfwk,\
-    CustomTarget_jreproperties \
-    Library_sunjavaplugin \
-    Package_jreproperties \
+	CustomTarget_jreproperties \
+	Library_jvmfwk \
+	Library_sunjavaplugin \
+	Package_jreproperties \
+	Package_rcfiles \
 ))
 
 ifneq (,$(filter-out MACOSX WNT,$(OS)))
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,jvmfwk,\
-    Executable_javaldx \
+	Executable_javaldx \
 ))
 endif
 endif
 
-ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(eval $(call gb_Module_add_targets,jvmfwk,\
-	Package_jreproperties_install \
-	Package_rcfiles_install \
-))
-endif
-
 endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index 7ca2ba8..1b3302f 100644
--- a/jvmfwk/Package_jreproperties.mk
+++ b/jvmfwk/Package_jreproperties.mk
@@ -9,7 +9,8 @@
 
 $(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
 
-$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class))
-$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class))
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class))
 
 # vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_jreproperties_install.mk b/jvmfwk/Package_jreproperties_install.mk
deleted file mode 100644
index a27fc3d..0000000
--- a/jvmfwk/Package_jreproperties_install.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,jvmfwk_jreproperties_install,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
-
-$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_install,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_install,ure/lib/JREProperties.class,JREProperties.class))
-
-# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 2949e3c..22b9fbd 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -7,36 +7,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk))
+$(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk))
 
-# The below files (intended to be also used during the build) need to go into
-# the same directory as dynamic libraries (either bin or lib):
-
-ifeq ($(OS),WNT)
-jvmfwk_Package_RCFILESDIR := bin
-else
-jvmfwk_Package_RCFILESDIR := lib
-endif
-
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/jvmfwk3),source/jvmfwk3rc))
+$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTDIR)))
 
 ifneq ($(OS),WNT)
 ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))

... etc. - the rest is truncated
