Added workaround for Flash full-screen bug (#462690).

[ion3.git] / ion / Makefile

diff --git a/ion/Makefile b/ion/Makefile
index a79fa9f16672b7943073788c97855456876ff330..d7239469f3da5c27bdb12d03767c75db345623dc 100644 (file)
--- a/ion/Makefile
+++ b/ion/Makefile
@@ -19,7 +19,7 @@ INCLUDES += $(X11_INCLUDES)
 INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES)
 INCLUDES += -I..
 
-LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
+LIBS += $(X11_LIBS)
 LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA)
 LIBS += $(LUA_LIBS) $(DL_LIBS)
 LIBS += -lm
@@ -31,11 +31,15 @@ SOURCES += preload.c
 TO_CLEAN += preload.c
 LIBS += -lSM -lICE
 else
-LINKOPTS = $(EXPORT_DYNAMIC)
+LDFLAGS += $(EXPORT_DYNAMIC)
 WHOLEA = -Wl,-whole-archive
 NO_WHOLEA = -Wl,-no-whole-archive
 endif
 
+ifeq ($(RELOCATABLE),1)
+DEFINES += -DCF_RELOCATABLE_ION3_LOCATION=\"$(BINDIR)/ion3\"
+endif
+
 EXT_OBJS += ../ioncore/ioncore.a
 
 DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
@@ -51,11 +55,11 @@ include $(TOPDIR)/build/rules.mk
 ######################################
 
 ion3: $(OBJS) $(EXT_OBJS)
-       $(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
+       $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
 
 preload.c:
        $(LUA) ../build/mkpreload.lua $(MODULE_LIST) > preload.c
 
 _install:
        $(INSTALLDIR) $(BINDIR)
-       $(INSTALL) -m $(BIN_MODE) ion3 $(BINDIR)
+       $(INSTALLBIN) ion3 $(BINDIR)