diff options
| author | Robert Nagy <robert@openbsd.org> | 2010-11-04 09:27:13 +0100 |
|---|---|---|
| committer | Robert Nagy <robert@openbsd.org> | 2010-11-05 09:14:39 +0100 |
| commit | 3de55fc78d544ed402818f28c2523fb204ded68a (patch) | |
| tree | 9e78075c1871ab1478d441fb81c6ae95e240b10b /cppunit | |
| parent | 57aaa8981c0d1752a0579aba31421c1782103aa7 (diff) | |
add the correct cppunit library name for OpenBSD
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/makefile.mk | 4 | ||||
| -rw-r--r-- | cppunit/prj/d.lst | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 50d489322d31..26e68450277a 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -142,7 +142,7 @@ OOO_STLPORT_LIBS += -lstdc++ # execute that program; however, the program would fail to locate the STLport # library (another work-around might be to add something like --as-needed around # $(LIBSTLPORT)): -.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" +.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "OPENBSD" .IF "$(LD_LIBRARY_PATH)" == "" LD_LIBRARY_PATH := $(SOLARLIBDIR) # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment @@ -183,6 +183,8 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib EXTRPATH = NONE .ELIF "$(OS)" == "AIX" OUT2LIB = ooo-install/lib/libcppunit-1.12.a +.ELIF "$(OS)" == "OPENBSD" +OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0 .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index e881e4a2d033..3e30ad21bbf0 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -24,6 +24,9 @@ symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit. ..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so +..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 +symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit.so + ..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a |