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

[ion3.git] / ion / Makefile

diff --git a/ion/Makefile b/ion/Makefile
index 1f1037ec07d5f49ccc1b6da0964eb22b8cc9c8f2..d7239469f3da5c27bdb12d03767c75db345623dc 100644 (file)
--- a/ion/Makefile
+++ b/ion/Makefile
@@ -31,17 +31,20 @@ 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)\" \
            -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
-          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
-          -DION3_LOCATION=\"$(BINDIR)/ion3\"
+          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
 
 CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
 
@@ -52,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)