--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -64,17 +64,20 @@ endif
 
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 TOOL_DIRS += samples/default/windows
 endif
 
 ifeq ($(OS_ARCH),OS2)
-TOOL_DIRS += samples/default/os2 os2wrapper
+TOOL_DIRS += samples/default/os2
+ifdef MOZ_OJI
+TOOL_DIRS += os2wrapper
+endif
 ifdef ENABLE_TESTS
 TOOL_DIRS += tools/tester/common tools/tester/os2
 endif
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 TOOL_DIRS += samples/default/mac
 endif