[svn-upgrade] Integrating new upstream version, ion3 (20071220)

[ion3.git] / ion / Makefile

diff --git a/ion/Makefile b/ion/Makefile
index a79fa9f16672b7943073788c97855456876ff330..1f1037ec07d5f49ccc1b6da0964eb22b8cc9c8f2 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
@@ -40,7 +40,8 @@ EXT_OBJS += ../ioncore/ioncore.a
 
 DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
            -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
-          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
+          -DION3_LOCATION=\"$(BINDIR)/ion3\"
 
 CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)