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

[ion3.git] / pwm / Makefile

diff --git a/pwm/Makefile b/pwm/Makefile
index 83f310042c5c09aad04ea7686d29d96f7e36ec83..2721bbfd74f1a170d2363e483de8b6b4f370c8c0 100644 (file)
--- a/pwm/Makefile
+++ b/pwm/Makefile
@@ -33,17 +33,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_PWM3_LOCATION=\"$(BINDIR)/pwm3\"
+endif
+
 EXT_OBJS += ../ioncore/ioncore.a
 
 DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
           -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
-          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
-          -DPWM3_LOCATION=\"$(BINDIR)/pwm3\"
+          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
 
 ifndef PWM_ETCDIR
 PWM_ETCDIR = $(ETCDIR)
@@ -60,14 +63,14 @@ include $(TOPDIR)/build/rules.mk
 ######################################
 
 pwm3: $(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 $(PWM_MODULE_LIST) > preload.c
 
 _install:
        $(INSTALLDIR) $(BINDIR)
-       $(INSTALL) -m $(BIN_MODE) pwm3 $(BINDIR)
+       $(INSTALLBIN) pwm3 $(BINDIR)
        $(INSTALLDIR) $(PWM_ETCDIR)
        for i in $(ETC); do \
                $(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \