# HG changeset patch
# User Jiri Kukacka <jiri.kukacka@oracle.com>
# Date 1389717050 28800
# Node ID 42add1f5f1828f7abb1120694b29e9f3e45653a0
# Parent  2490bf4f53eaabb67eeedd6e27f3a817d617df64
18075453 Update wget to ASLR + 64b

diff -r 2490bf4f53ea -r 42add1f5f182 components/wget/Makefile
--- a/components/wget/Makefile	Wed Jan 22 15:55:22 2014 -0700
+++ b/components/wget/Makefile	Tue Jan 14 08:30:50 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -36,6 +36,9 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# Enforce wget binary to standard path
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+
 # Enforce openssl (--with-ssl=openssl) instead of default gnutls
 # (--with-ssl) as wget doesn't work for secure connections with gnutls. 
 # Set PATH to find /usr/perl5/bin/pod2man, so that the man page wget.1
@@ -61,11 +64,14 @@
 	gtar --get $(WWW)/lib/HTTP $(WWW)/lib/LWP $(WWW)/lib/LWP.pm \
 	     --strip-components=2 -f $(WWW).tar.gz; )
 
-build:		$(BUILD_32)
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
-install:	$(INSTALL_32)
+build:		$(BUILD_64)
 
-test:		$(TEST_32)
+install:	$(INSTALL_64)
+
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)