mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* common.mk (info): shows configured names.
* configure.in (Makefile): works even if RUBY_INSTALL_NAME contains macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
99b38e10f7
commit
d9921b1de6
4 changed files with 19 additions and 4 deletions
|
@ -1,4 +1,9 @@
|
|||
Tue Apr 7 13:14:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Tue Apr 7 13:35:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* common.mk (info): shows configured names.
|
||||
|
||||
* configure.in (Makefile): works even if RUBY_INSTALL_NAME
|
||||
contains macro.
|
||||
|
||||
* configure.in (LIBRUBY_DLDFLAGS): compatibility version is
|
||||
ruby_version.
|
||||
|
|
|
@ -159,7 +159,7 @@ $(LIBRUBY_SO):
|
|||
|
||||
fake: $(arch)-fake.rb
|
||||
$(arch)-fake.rb: config.status
|
||||
@./config.status --file=$@:$(srcdir)/template/fake.rb.in
|
||||
@./config.status --file=$@:$(srcdir)/template/fake.rb.in
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
|
||||
|
||||
|
|
10
common.mk
10
common.mk
|
@ -750,6 +750,16 @@ dist:
|
|||
up::
|
||||
-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
|
||||
|
||||
info: info-program info-libruby_a info-libruby_so info-arch
|
||||
info-program:
|
||||
@echo PROGRAM=$(PROGRAM)
|
||||
info-libruby_a:
|
||||
@echo LIBRUBY_A=$(LIBRUBY_A)
|
||||
info-libruby_so:
|
||||
@echo LIBRUBY_SO=$(LIBRUBY_SO)
|
||||
info-arch:
|
||||
@echo arch=$(arch)
|
||||
|
||||
help: PHONY
|
||||
@echo " Makefile of Ruby"
|
||||
@echo ""
|
||||
|
|
|
@ -2506,7 +2506,7 @@ AC_CONFIG_FILES(Makefile, [{
|
|||
fi
|
||||
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
|
||||
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
|
||||
test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
|
||||
${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null || echo 'ruby: $(PROGRAM);'
|
||||
if test "$gnumake" != yes; then
|
||||
echo ['$(MKFILES): $(srcdir)/common.mk']
|
||||
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
|
||||
|
@ -2514,7 +2514,7 @@ AC_CONFIG_FILES(Makefile, [{
|
|||
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
|
||||
fi
|
||||
} >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
|
||||
[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT gnumake=$gnumake])
|
||||
[EXEEXT=$EXEEXT gnumake=$gnumake])
|
||||
AC_OUTPUT
|
||||
dnl }
|
||||
dnl }
|
||||
|
|
Loading…
Add table
Reference in a new issue