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

[ion3.git] / build / rules.mk

diff --git a/build/rules.mk b/build/rules.mk
index f4f18d1f261e0b88175759a482da7c796d477bad..488a02af209349208f13db7ab3c5b1025a8e0d30 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -2,10 +2,6 @@
 ## Some make rules
 ##
 
-ifdef RELOCATABLE
-DEFINES += -DCF_RELOCATABLE
-endif
-
 ifdef MODULE
 ifeq ($(PRELOAD_MODULES),1)
 MODULE_TARGETS := $(MODULE).a $(MODULE).lc
@@ -107,7 +103,7 @@ $(MODULE).so: $(OBJS) $(EXT_OBJS)
 
 module_install: module_stub_install
        $(INSTALLDIR) $(MODULEDIR)
-       $(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR)
+       $(INSTALLBIN) $(MODULE).so $(MODULEDIR)
 
 else # PRELOAD_MODULES
 
@@ -220,3 +216,9 @@ TO_CLEAN += potfiles_c potfiles_lua
 _potfiles:
        echo "$(SOURCES)"|tr ' ' '\n' > potfiles_c
        echo "$(LUA_SOURCES) $(ETC)"|tr ' ' '\n' > potfiles_lua
+
+# Defaults
+######################################
+
+INSTALL_STRIP ?= -s
+INSTALLBIN ?= $(INSTALL) $(INSTALL_STRIP) -m $(BIN_MODE)