From: Mehdi Dogguy <mehdi@debian.org>
Date: Tue, 27 Apr 2010 11:29:19 +0200
Subject: [PATCH] Fix build on bytecode-only architectures

---
 Makefile |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 4c9e01a..8e6a14c 100644
--- a/Makefile
+++ b/Makefile
@@ -1232,7 +1232,7 @@ lablgtk.cmxa:
 
 include share/Makefile.plugin
 
-gui: lib/plugins/Gui.cmo
+gui:: lib/plugins/Gui.cmo
 
 else
 
@@ -1249,6 +1249,7 @@ SINGLE_GUI_CMO:= gui_parameters \
 	property_navigator
 SINGLE_GUI_CMO:= $(patsubst %, src/gui/%.cmo, $(SINGLE_GUI_CMO))
 
+SINGLE_GUI_O = $(SINGLE_GUI_CMO:.cmo=.o)
 SINGLE_GUI_CMI = $(SINGLE_GUI_CMO:.cmo=.cmi)
 SINGLE_GUI_CMX = $(SINGLE_GUI_CMO:.cmo=.cmx)
 
@@ -1271,8 +1272,10 @@ $(PLUGIN_DEP_GUI_CMX_LIST) $(PLUGIN_DYN_DEP_GUI_CMX_LIST): OFLAGS+= $(GUI_INCLUD
 
 .PHONY:gui
 
-gui:: bin/viewer.byte$(EXE) bin/viewer.opt$(EXE) \
-      share/Makefile.dynamic_config share/Makefile.kernel
+ifeq ($(OCAMLBEST),opt)
+gui:: bin/viewer.opt$(EXE)
+endif
+gui:: bin/viewer.byte$(EXE) share/Makefile.dynamic_config share/Makefile.kernel
 	$(MAKE) install-gui FRAMAC_LIBDIR=lib/fc
 
 ALL_GUI_CMO= $(ALL_CMO) $(GRAPH_GUICMO) $(GUICMO)
@@ -1635,10 +1638,12 @@ install-kernel-opt:
 install-gui:
 	$(PRINT_CP) gui API
 	$(MKDIR) $(FRAMAC_LIBDIR)
-	if [ "$(ENABLE_GUI)" != "no" ]; then \
-	  $(CP) $(SINGLE_GUI_CMI) $(SINGLE_GUI_CMO) $(SINGLE_GUI_CMX) \
-	    $(FRAMAC_LIBDIR); \
-        fi
+ifneq ($(ENABLE_GUI),no)
+	$(CP) $(SINGLE_GUI_CMI) $(SINGLE_GUI_CMO) $(FRAMAC_LIBDIR)
+ifeq ($(OCAMLBEST),opt)
+	$(CP) $(SINGLE_GUI_CMX) $(SINGLE_GUI_O) $(FRAMAC_LIBDIR)
+endif
+endif
 
 .PHONY: install
 install::
--