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/ircii/Makefile | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/components/ircii/Makefile b/components/ircii/Makefile index 8931f7b..1af9480 100644 --- a/components/ircii/Makefile +++ b/components/ircii/Makefile @@ -40,7 +40,15 @@ include ../../make-rules/configure.mk include ../../make-rules/ips.mk +# Needed to correctly include <curses.h> and <term.h> when compiling the +# various C source files. +CFLAGS += -DINCLUDE_CURSES_H + CONFIGURE_ENV += CC="$(CC)" +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" + +CC += $(CC_BITS) +COMPONENT_BUILD_ARGS += CC="$(CC)" # We need to reset configure options here because ircii is confused with # CC and CFLAGS definitions as configure parameters. @@ -57,15 +65,15 @@ # # This action modifies the libexecdir setting in the Makefile to /usr/bin COMPONENT_POST_CONFIGURE_ACTION = \ - $(GSED) -i -e 's|/usr/libexec|/usr/bin|' $(BUILD_DIR_32)/Makefile + $(GSED) -i -e 's|/usr/libexec|/usr/bin|' $(BUILD_DIR_64)/Makefile # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) # common targets -build: $(BUILD_32) +build: $(BUILD_64) -install: $(INSTALL_32) +install: $(INSTALL_64) test: $(NO_TESTS) -- Gitblit v1.9.3