Browse code

Added flexability to Makefile

YustasSwamp authored on 2015/06/10 05:50:25
Showing 2 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # Copyright VMware, Inc 2015
3 3
 #
4 4
 
5
-SRCROOT := .
5
+SRCROOT := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
6 6
 MAKEROOT=$(SRCROOT)/support/make
7 7
 
8 8
 # do not build these targets as '%'
... ...
@@ -66,7 +66,7 @@ sources:
66 66
 	@echo "Pulling sources from bintray..."
67 67
 	@$(MKDIR) -p $(PHOTON_SRCS_DIR) && \
68 68
 	 cd $(PHOTON_PULL_SOURCES_DIR) && \
69
-	 $(PHOTON_PULL_SOURCES) $(PHOTON_SRCS_DIR)
69
+	 $(PHOTON_PULL_SOURCES) -c $(PHOTON_BINTRAY_CONFIG) $(PHOTON_SRCS_DIR)
70 70
 
71 71
 sources-cached:
72 72
 	@echo "Using cached SOURCES..."
... ...
@@ -18,7 +18,7 @@ VAGRANT_BUILD=vagrant
18 18
 SRCROOT := $(realpath $(SRCROOT))
19 19
 MAKEROOT := $(realpath $(MAKEROOT))
20 20
 
21
-PHOTON_STAGE=$(SRCROOT)/stage
21
+PHOTON_STAGE?=$(SRCROOT)/stage
22 22
 PHOTON_TOOLS_DIR=$(PHOTON_STAGE)/tools
23 23
 PHOTON_TOOLCHAIN_DIR=$(SRCROOT)/support/toolchain
24 24
 PHOTON_TOOLCHAIN=$(PHOTON_STAGE)/tools-build.tar
... ...
@@ -28,7 +28,7 @@ PHOTON_TOOLCHAIN_BUILDER=$(PHOTON_TOOLCHAIN_DIR)/mk-tools.sh
28 28
 PHOTON_TOOLS_MAKE=$(PHOTON_TOOLS_DIR)/bin/make
29 29
 PHOTON_LOGS_DIR=$(PHOTON_STAGE)/LOGS
30 30
 PHOTON_RPMS_DIR=$(PHOTON_STAGE)/RPMS
31
-PHOTON_SPECS_DIR=$(SRCROOT)/SPECS
31
+PHOTON_SPECS_DIR?=$(SRCROOT)/SPECS
32 32
 PHOTON_SRCS_DIR=$(PHOTON_STAGE)/SOURCES
33 33
 PHOTON_PUBLISH_RPMS_DIR=$(PHOTON_STAGE)/PUBLISHRPMS
34 34
 
... ...
@@ -40,6 +40,7 @@ PHOTON_INSTALLER_DIR=$(SRCROOT)/installer
40 40
 PHOTON_INSTALLER=$(PHOTON_INSTALLER_DIR)/photonInstaller.py
41 41
 PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/builder.py
42 42
 PHOTON_PULL_SOURCES=$(PHOTON_PULL_SOURCES_DIR)/pullsources.py
43
+PHOTON_BINTRAY_CONFIG?=$(PHOTON_PULL_SOURCES_DIR)/bintray.conf
43 44
 PHOTON_PULL_PUBLISH_RPMS=$(PHOTON_PULL_PUBLISH_RPMS_DIR)/pullpublishrpms.sh
44 45
 
45 46
 PHOTON_CHROOT_CLEANER=$(PHOTON_PKG_BUILDER_DIR)/cleanup-build-root.sh