diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-14 14:10:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-14 14:10:08 +0000 |
| commit | f76f6155e11f1d9bae9a9a1f61bb8a5646b6ec2e (patch) | |
| tree | 08d4051a7ab8940d1b148995321365183dfc5606 /win32/Makefile.sub | |
| parent | b367743e929b0bdd726736810163caf76c45a185 (diff) | |
* win32/Makefile.sub (MKFILES): update MKFILES if configure files get
changed.
* win32/configure.bat, win32/setup.mak (configure_args): store
arguments to configure files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c5c7b49ab5..1b0279ce23 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -6,6 +6,12 @@ NULL = nul #### Start of system configuration section. #### +!if defined(pathlist) +PATH = $(pathlist:;=/bin;)$(PATH) +INCLUDE = $(pathlist:;=/include;) +LIB = $(pathlist:;=/lib;) +!endif + ## variables may be overridden by $(compile_dir)/Makefile !ifndef srcdir srcdir = .. @@ -179,6 +185,10 @@ rubyw: $(WPROGRAM) !include $(srcdir)/common.mk +$(MKFILES): $(srcdir)/win32/Makefile.sub $(srcdir)/win32/configure.bat $(srcdir)/win32/setup.mak + $(srcdir:/=\)\win32\configure.bat $(configure_args) + @echo $(MKFILES) should be updated, re-run $(MAKE). + CONFIG_H = ./.config.h.time config: config.status @@ -187,6 +197,9 @@ config.status: $(CONFIG_H) $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub @echo Creating config.h +!if exist(config.h) + @copy config.h config.h.old > nul +!endif @$(srcdir:/=\)\win32\ifchange.bat config.h << #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 |