diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-16 14:58:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-16 14:58:34 +0000 |
commit | 8695612caf8afe1138a7baaa142658dd93c70293 (patch) | |
tree | c6d71782b58b573eb26d942682b84acc0a33561c /Makefile.in | |
parent | 32df87feabb8b2b99fc47e64896b2c922dca6451 (diff) | |
download | ruby-8695612caf8afe1138a7baaa142658dd93c70293.tar.gz |
* marshal.c (w_symbol, w_object): get rid of warnings.
* re.c (rb_memsearch): ditto.
* time.c (time_dump): ditto.
* ext/extmk.rb (extmake): not continue making when extconf.rb
failed.
* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
* ext/openssl/ossl.h: remove version.h dependency.
* ext/openssl/ruby_missing.h: ditto.
* lib/mkmf.rb (pkg_config): use --libs output except with
only-L for other options. [ruby-list:38099]
* lib/mkmf.rb (create_makefile): separate rule for static
library from shared object.
* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
define exec_prefix and libdir.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 9772438db5..26c2bb820b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,12 +196,12 @@ Makefile: $(srcdir)/Makefile.in @MAKEFILES@: config.status MAKE=$(MAKE) $(SHELL) ./config.status - @{ : $(MAKE); \ + @{ \ echo "all:; -@rm -f conftest.mk"; \ echo "conftest.mk: .force; @echo AUTO_REMAKE"; \ echo ".force:"; \ - } > conftest.mk - @$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \ + } > conftest.mk || exit 1; \ + $(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \ { echo "Makefile updated, restart."; exit 1; } config.status: $(srcdir)/configure |