From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 components/python/cssutils/Makefile |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/python/cssutils/Makefile b/components/python/cssutils/Makefile
index 43a3f76..c28bc4e 100644
--- a/components/python/cssutils/Makefile
+++ b/components/python/cssutils/Makefile
@@ -39,6 +39,9 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_ARGS= ./setup.py test
+
 # Remove the trailing Control-M's from the Python source files.
 COMPONENT_PRE_BUILD_ACTION = \
 	/usr/bin/find $(SOURCE_DIR)/src \
@@ -67,12 +70,11 @@
 COMPONENT_PRE_INSTALL_ACTION = \
 	(cd $(SOURCE_DIR); $(RM) -r src ; $(CP) -rp src-$(PYTHON_VERSION) src )
 
-# common targets
-build:          $(BUILD_32)
+build:          $(BUILD_NO_ARCH)
 
-install:        $(INSTALL_32)
+install:        $(INSTALL_NO_ARCH)
 
-test:           $(NO_TESTS)
+test:           $(TEST_NO_ARCH)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 

--
Gitblit v1.9.3