diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-18 16:14:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:05 +0200 |
| commit | 0ed6f8c28e88f892c70be066394feb71d846a945 (patch) | |
| tree | 44b5bfdf07b1646d9f26cb21b90f87f3c23d5eb2 | |
| parent | 41f00a356e9516aef62030668bb8f3928bdfb8f2 (diff) | |
pyuno: another filelist to make instdir better
Change-Id: Ieda9b3847de3de8989eaafc542e60216baa1af4d
| -rw-r--r-- | pyuno/Package_python_shell.mk | 4 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk index 6aed55ab71dd..306e2430ba20 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 fee4cdf4ecb8..85c0a8e05476 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 |