components/rsyslog/Makefile
changeset 1261 9aaa91c63cb9
parent 1095 e720196b46b2
child 1496 f774cfa29f53
--- a/components/rsyslog/Makefile	Thu Apr 11 10:53:26 2013 -0700
+++ b/components/rsyslog/Makefile	Thu Apr 11 10:55:54 2013 -0700
@@ -40,6 +40,11 @@
 # This is needed for things to be built correctly.
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 
+# A normal 64-bit build would result in /usr/lib/$(MACH64)/rsyslog but since we
+# have a self-contained eco-system, simplify things for customers and just use
+# /usr/lib/rsyslog .
+CONFIGURE_LIBDIR.64 =	$(CONFIGURE_LIBDIR.32)
+
 CONFIGURE_OPTIONS +=    --enable-imsolaris
 CONFIGURE_OPTIONS +=    --enable-mail
 CONFIGURE_OPTIONS +=    --enable-gssapi_krb5
@@ -47,12 +52,14 @@
 CONFIGURE_OPTIONS +=    --disable-klog
 CONFIGURE_OPTIONS +=    --sbindir=/usr/lib/rsyslog
 
-# common targets
-build:		$(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
 
-install:	$(INSTALL_32)
+# common targets
+build:		$(BUILD_64)
 
-test:		$(TEST_32)
+install:	$(INSTALL_64)
+
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)