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/cherrypy/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/python/cherrypy/Makefile b/components/python/cherrypy/Makefile index d325ef3..33e457b 100644 --- a/components/python/cherrypy/Makefile +++ b/components/python/cherrypy/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 @@ -45,9 +45,9 @@ # common targets -build: $(BUILD_32) +build: $(BUILD_NO_ARCH) -install: $(INSTALL_32) +install: $(INSTALL_NO_ARCH) test: $(NO_TESTS) -- Gitblit v1.9.3