summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2016-12-23 21:31:18 +0100
committerMatúš Kukan <matus@libreoffice.org>2016-12-24 07:59:11 +0000
commit5662817149e3eed0a592c389042d9c3755629614 (patch)
tree6c0f9caccb6227756049ef794970eeeaf5cc365a
parentf05714c3527635bd78bf7ded7b7a160dbe3b4685 (diff)
tdf#90753: AutoInstall postgresql-sdbc.ini as filelist
Change-Id: I908b549a14c702ce2c33de704b06d016036ccecb Reviewed-on: https://gerrit.libreoffice.org/32394 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org>
-rw-r--r--Repository.mk5
-rw-r--r--scp2/source/base/postgresqlsdbc.scp8
2 files changed, 4 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk
index dcfa3937922a..6423202c4d39 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -773,7 +773,6 @@ endif
$(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
- $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
$(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
@@ -821,6 +820,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
))
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+ $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
+))
+
$(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 23bbd4484818..94e6936771fa 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -18,20 +18,12 @@ Module gid_Module_Optional_PostgresqlSdbc
MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
ParentID = gid_Module_Prg_Base_Bin;
Files = (auto_postgresqlsdbc_ALL,
- gid_File_PostgresqlSdbc_Ini,
gid_File_PostgresqlSdbc_Rdb,
gid_File_PostgresqlSdbc_Xcd);
Default = YES;
Styles = ();
End
-File gid_File_PostgresqlSdbc_Ini
- TXT_FILE_BODY;
- Dir = GID_BRAND_DIR_ETC;
- Name = "postgresql-sdbc.ini";
- Styles = (PACKED);
-End
-
File gid_File_PostgresqlSdbc_Rdb
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program_Services;