summaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-13 15:49:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-13 15:49:56 +0000
commit8e7458bc3c512264a89d66798ea649b6bac656f0 (patch)
tree16ce36a848154badbfebe1594fd0790e5917ada9 /common.mk
parent05399745bf5ce56c12741ef076f267de39de8a4d (diff)
downloadruby-8e7458bc3c512264a89d66798ea649b6bac656f0.tar.gz
ruby-8e7458bc3c512264a89d66798ea649b6bac656f0.tar.xz
ruby-8e7458bc3c512264a89d66798ea649b6bac656f0.zip
* common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766]
* instruby.rb (parse_args): added --data-mode and --prog-mode options. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index b4f4b9dc2..d6c0331db 100644
--- a/common.mk
+++ b/common.mk
@@ -84,11 +84,15 @@ GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--extout="$(EXTOUT)" \
- --make="$(MAKE)" \
--mflags="$(MFLAGS)" \
--make-flags="$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
-INSTRUBY_ARGS = $(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST)
+INSTRUBY_ARGS = $(SCRIPT_ARGS) \
+ --data-mode=$(INSTALL_DATA_MODE) \
+ --prog-mode=$(INSTALL_PROG_MODE) \
+ --installed-list $(INSTALLED_LIST)
+INSTALL_PROG_MODE = 0755
+INSTALL_DATA_MODE = 0644
PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)