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/ldtp/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/python/ldtp/Makefile b/components/python/ldtp/Makefile
index 3e4e64a..34372b9 100644
--- a/components/python/ldtp/Makefile
+++ b/components/python/ldtp/Makefile
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -44,9 +44,9 @@
 	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f ldtp ldtp$(PYTHON_VERSION))
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_NO_ARCH)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_NO_ARCH)
 
 test:		$(NO_TESTS)
 

--
Gitblit v1.9.3