diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-15 04:34:49 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-15 04:34:49 +0100 |
| commit | fc199c7b9499dc622307df934f86cdcb25a69b67 (patch) | |
| tree | 6528530e1eeff3e2cfa2de73f3011d6fb7e1d6c1 | |
| parent | 0b86569a150c3b84bac512512a2dc4ccef4eb46d (diff) | |
gnumake3: fixing layer names
| -rwxr-xr-x | solenv/gbuild/platform/linux.mk | 2 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/solaris.mk | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 08d151685d5b..25ad9db02f7d 100755 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -189,7 +189,7 @@ endef gb_LinkTarget__RPATHS := \ URELIB:$$$$ORIGIN \ UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ - OOOLIB:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \ + OOO:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \ BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \ SDKBIN:$$$$ORIGIN/../../ure-link/lib \ NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 737af4d04444..6ad5aa961a34 100755 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -203,7 +203,7 @@ endef gb_LinkTarget__RPATHS := \ URELIB:@__________________________________________________URELIB/ \ UREBIN: \ - OOOLIB:@__________________________________________________OOO/ \ + OOO:@__________________________________________________OOO/ \ BRAND: \ SDKBIN: \ NONEBIN: \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 631f05cd5d75..4fcabe59615d 100755 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -171,7 +171,7 @@ endef gb_LinkTarget__RPATHS := \ URELIB:$$$$ORIGIN \ UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ - OOOLIB:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \ + OOO:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \ BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \ SDKBIN:$$$$ORIGIN/../../ure-link/lib \ NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ @@ -258,14 +258,14 @@ gb_Library_FILENAMES := \ gb_Library_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ define gb_Library_get_rpath |