Skip to main content

Source code Changes To

gate / make-rules / shared-macros.mk

From revision 1504 to 1505:

diff -r 494ab4b154c8 -r f99c0e9ebba7 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Tue Mar 12 17:02:48 2013 -0700
+++ b/make-rules/shared-macros.mk	Wed Mar 13 19:01:31 2013 -0600
@@ -89,6 +89,8 @@
 
 PKG_REPO =	file:$(WS_REPO)
 
+COMPONENT_SRC_NAME =	$(COMPONENT_NAME)
+
 COMPONENT_DIR =	$(shell pwd)
 SOURCE_DIR =	$(COMPONENT_DIR)/$(COMPONENT_SRC)
 BUILD_DIR =	$(COMPONENT_DIR)/build
@@ -282,8 +284,8 @@
 PYTHON.2.7.32 =	/usr/bin/python2.7
 PYTHON.2.7.64 =	/usr/bin/$(MACH64)/python2.7
 
-PYTHON.32 =	$(PYTHON.$(PYTHON_VERSION).$(BITS))
-PYTHON.64 =	$(PYTHON.$(PYTHON_VERSION).$(BITS))
+PYTHON.32 =	$(PYTHON.$(PYTHON_VERSION).32)
+PYTHON.64 =	$(PYTHON.$(PYTHON_VERSION).64)
 PYTHON =	$(PYTHON.$(PYTHON_VERSION).$(BITS))
 
 # The default is site-packages, but that directory belongs to the end-user.
@@ -351,7 +353,7 @@
 
 PKG_CONFIG_PATH.32 = /usr/lib/pkgconfig
 PKG_CONFIG_PATH.64 = /usr/lib/$(MACH64)/pkgconfig
-PKG_CONFIG_PATH = PKG_CONFIG_PATH.$(BITS)
+PKG_CONFIG_PATH = $(PKG_CONFIG_PATH.$(BITS))
 
 
 #
@@ -647,3 +649,11 @@
 NO_TESTS =	test-nothing
 test-nothing:
 	@echo "There are no tests available at this time."
+
+# default behaviour for 'component-hook' target is to echo the component
+# name and version information, but more complex behaviour can be implemented
+# via command line setting of the COMPONENT_HOOK macro.
+COMPONENT_HOOK ?=	echo $(COMPONENT_NAME) $(COMPONENT_VERSION)
+
+component-hook:
+	@$(COMPONENT_HOOK)

 
 
Close
loading
Please Confirm
Close