fix bogus include order: picks up /usr/local/include/recode.h

This commit is contained in:
espie 2007-11-08 20:51:23 +00:00
parent 6fc26f3605
commit 60f104e08e
3 changed files with 23 additions and 6 deletions

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-apps_irssi_src_fe-common_core_Makefile_in,v 1.1 2007/11/08 20:51:23 espie Exp $
--- apps/irssi/src/fe-common/core/Makefile.in.orig Thu Nov 8 21:45:14 2007
+++ apps/irssi/src/fe-common/core/Makefile.in Thu Nov 8 21:45:45 2007
@@ -266,11 +266,11 @@ noinst_LIBRARIES = libfe_common_core.a
#
# INCLUDE defines
#
-INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
+INCLUDES = $(ADD_INCLUDES) -DHAVE_SILCDEFS_H \
-I$(srcdir) -I$(top_srcdir) -I$(silc_top_srcdir) \
$(SILC_LIB_INCLUDES) -I$(silc_top_srcdir)/includes \
-I$(silc_top_srcdir)/doc -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/core/ $(GLIB_CFLAGS) \
+ -I$(top_srcdir)/src/core/ $(GLIB_CFLAGS) $(SILC_CFLAGS) \
-DHELPDIR=\""$(silc_helpdir)"\" \
-DTHEMESDIR=\""$(silc_etcdir)"\"
libfe_common_core_a_SOURCES = \

View File

@ -1,6 +1,6 @@
--- apps/irssi/src/fe-common/core/fe-common-core.c.orig Fri Jul 27 13:21:58 2007
+++ apps/irssi/src/fe-common/core/fe-common-core.c Fri Jul 27 13:22:30 2007
@@ -176,7 +176,8 @@
--- apps/irssi/src/fe-common/core/fe-common-core.c.orig Thu Jan 25 13:02:14 2007
+++ apps/irssi/src/fe-common/core/fe-common-core.c Tue Nov 6 10:48:23 2007
@@ -176,7 +176,8 @@ void fe_common_core_init(void)
settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
settings_add_str("lookandfeel", "term_charset",

View File

@ -1,6 +1,6 @@
--- apps/irssi/src/fe-common/core/fe-recode.c.orig Fri Jul 27 13:55:52 2007
+++ apps/irssi/src/fe-common/core/fe-recode.c Fri Jul 27 13:56:54 2007
@@ -182,8 +182,8 @@
--- apps/irssi/src/fe-common/core/fe-recode.c.orig Thu Jan 25 13:02:14 2007
+++ apps/irssi/src/fe-common/core/fe-recode.c Tue Nov 6 10:48:23 2007
@@ -182,8 +182,8 @@ static void read_settings(void)
g_free(term_charset);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) :