From 50b311964f4b1baf4bd3dd0ac60217bad47bcc01 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 11 Jul 2016 09:32:10 +0300 Subject: skeleton: use SOURCE_DIR and BUILD_DIR and do not mkdir build dir. --- tools/skeleton.py | 20 +++++++++----------- 1 file 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 = { -- cgit v0.12