diff options
| -rw-r--r-- | scp2/source/python/file_python.scp | 15 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 4 | ||||
| -rw-r--r-- | scripting/Package_scriptproviderforpython.mk | 6 |
3 files changed, 9 insertions, 16 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 6684204ceb0b..1c7549071ee9 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -29,18 +29,11 @@ #ifndef DISABLE_PYUNO -File gid_File_Py_Pythonscript +File gid_File_scriptproviderforpython TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pythonscript.py"; - Styles = (PACKED); -End - -File gid_File_Rdb_Scriptproviderforpython - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program_Services; - Name = "scriptproviderforpython.rdb"; - Styles = (PACKED); + Dir = FILELIST_DIR; + Name = "scriptproviderforpython.filelist"; + Styles = (FILELIST, PACKED); End File gid_File_Lib_Pyuno diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index a7288cd31803..61451cf167f5 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -81,9 +81,7 @@ End Module gid_Module_Script_Provider_For_Python PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root_Brand; - Files = ( - gid_File_Py_Pythonscript, - gid_File_Rdb_Scriptproviderforpython ); + Files = ( gid_File_scriptproviderforpython ); Default = YES; Styles = (HIDDEN_ROOT); End diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk index 641c3cbc3910..29830a06ba40 100644 --- a/scripting/Package_scriptproviderforpython.mk +++ b/scripting/Package_scriptproviderforpython.mk @@ -9,7 +9,9 @@ $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov)) -$(eval $(call gb_Package_add_file,scriptproviderforpython,xml/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) -$(eval $(call gb_Package_add_file,scriptproviderforpython,bin/pythonscript.py,pythonscript.py)) +$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,scriptproviderforpython,program/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) +$(eval $(call gb_Package_add_file,scriptproviderforpython,program/pythonscript.py,pythonscript.py)) # vim: set noet sw=4 ts=4: |