This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d862ed19fc3cfb8efc77f78b047c291a4beab3ab
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Sun Jan 19 04:30:29 2025 +0200
Fix supported platforms for the ADABAS connectivity driver.
Fix configuration packaging for several Windows and Mac
connectivity drivers.
Patch by: me
---
main/connectivity/source/drivers/adabas/BFunctions.cxx | 6 +++---
main/postprocess/packregistry/makefile.mk | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/main/connectivity/source/drivers/adabas/BFunctions.cxx
b/main/connectivity/source/drivers/adabas/BFunctions.cxx
index a2b5c5327e..d483419bd4 100644
--- a/main/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/main/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -112,7 +112,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
if ( osl_getEnvironment(sTemp.pData,&pPath) == osl_Process_E_None &&
pPath )
{
-#if ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) || defined(MACOSX)
+#if defined(UNX)
_rPath = ::rtl::OUString(pPath);
_rPath += ::rtl::OUString::createFromAscii("/lib/");
#endif
@@ -127,10 +127,10 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
#if defined(WNT)
pLibraryAsciiName = "SQLOD32.DLL";
-#elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX)
- pLibraryAsciiName = "odbclib.so";
#elif defined(MACOSX)
pLibraryAsciiName = "odbclib.dylib";
+#elif defined(UNX)
+ pLibraryAsciiName = "odbclib.so";
#endif
if ( !pLibraryAsciiName )
return sal_False;
diff --git a/main/postprocess/packregistry/makefile.mk
b/main/postprocess/packregistry/makefile.mk
index 81658403ea..91a2667a0b 100644
--- a/main/postprocess/packregistry/makefile.mk
+++ b/main/postprocess/packregistry/makefile.mk
@@ -306,7 +306,7 @@ MY_FILES_main += \
.END
.IF "$(GUIBASE)" == "aqua"
MY_FILES_main += \
- $(MY_MOD)/DataAccess/macab.xcu \
+ $(MY_XCU)/Office/DataAccess/macab.xcu \
$(MY_MOD)/org/openoffice/Inet-macosx.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-macosx.xcu \
$(MY_MOD)/org/openoffice/Office/Common-macosx.xcu \
@@ -326,7 +326,7 @@ MY_FILES_main += \
# VCL-unixdesktop.xcu must come after VCL.xcu
.ELIF "$(GUIBASE)" == "WIN"
MY_FILES_main += \
- $(MY_MOD)/DataAccess/ado.xcu \
+ $(MY_XCU)/Office/DataAccess/ado.xcu \
$(MY_MOD)/org/openoffice/Inet-wnt.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
$(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
@@ -342,12 +342,12 @@ MY_FILES_main += \
.ELSE
ERROR : unknown-GUIBASE
.END
-.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || "$(OS)" == "OS2" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD"
-MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
+.IF "$(OS)" == "WNT" || "$(GUIBASE)" == "aqua" ||\
+ "$(GUIBASE)" == "unx"
+MY_FILES_main += $(MY_XCU)/Office/DataAccess/adabas.xcu
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+MY_FILES_main += $(MY_XCU)/Office/DataAccess/evoab2.xcu
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
