diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-07-11 06:32:10 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-07-11 06:32:10 (GMT) |
| commit | 50b311964f4b1baf4bd3dd0ac60217bad47bcc01 (patch) | |
| tree | 0c1b88dbca637ec5ec4a7cae4bb46759116f64f7 /tools | |
| parent | 1d75e1f3537e7263fa83255fafe4afb89457a6bb (diff) | |
| download | mxe-50b311964f4b1baf4bd3dd0ac60217bad47bcc01.zip mxe-50b311964f4b1baf4bd3dd0ac60217bad47bcc01.tar.gz mxe-50b311964f4b1baf4bd3dd0ac60217bad47bcc01.tar.bz2 | |
skeleton: use SOURCE_DIR and BUILD_DIR
and do not mkdir build dir.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/skeleton.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tools/skeleton.py b/tools/skeleton.py index 0c4974b..e8ef123 100755 --- a/tools/skeleton.py +++ b/tools/skeleton.py @@ -40,20 +40,18 @@ endef CMAKE_BUILD = r''' # build and install the library - mkdir '$(1).build' - cd '$(1).build' && $(TARGET)-cmake \ - '$(1)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install ''' AUTOTOOLS_BUILD = r''' # build and install the library - mkdir '$(1).build' - cd '$(1).build' && $(1)/configure \ + cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install \ + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install \ bin_PROGRAMS= \ sbin_PROGRAMS= \ noinst_PROGRAMS= @@ -61,8 +59,8 @@ AUTOTOOLS_BUILD = r''' MAKE_BUILD = r''' # build and install the library - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(SOURCE_DIR)' -j 1 install ''' BUILDERS = { |