diff options
| author | Yuri Dario <ydario@apache.org> | 2012-02-16 15:26:47 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2012-02-16 15:26:47 +0000 |
| commit | 22ab226a7fa502225c51ec5c3e11c6f5d4680b5d (patch) | |
| tree | c60ab83f6f56b3fd56cb5c028758197cc19cc209 /postprocess | |
| parent | ef233299f013e9e68f4ea6ce7c150435b1ddd8a9 (diff) | |
i118923 - OS/2 port: minor build fix.
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 3 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index e53ca21e49b3..b68897bcb8e7 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -342,11 +342,12 @@ my_components += adabas .IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \ "$(WITH_MOZILLA)" != "NO" my_components += mozab +.ELIF "$(OS)" == "OS2" .ELSE my_components += mozbootstrap .END -.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" +.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2" my_components += desktopbe1 .END diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 8f98815f9035..9e75ae01a689 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -315,10 +315,17 @@ MY_FILES_main += \ $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \ $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu # Inet-wnt.xcu must come after Inet.xcu +.ELIF "$(GUIBASE)" == "os2" +MY_FILES_main += \ + $(MY_MOD)/org/openoffice/Inet-wnt.xcu \ + $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \ + $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \ + $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu + # Inet-wnt.xcu must come after Inet.xcu .ELSE ERROR : unknown-GUIBASE .END -.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || \ +.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || "$(OS)" == "OS2" || \ ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD" MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu .END @@ -471,7 +478,7 @@ MY_FILES_ogltrans = \ $(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu .END -.IF "$(GUIBASE)" == "WIN" +.IF "$(GUIBASE)" == "WIN" || "$(GUIBASE)" == "os2" MY_XCDS += $(MISC)/forcedefault.xcd MY_DEPS_forcedefault = main MY_FILES_forcedefault = \ |