From 2ba7abd687a38b40b6d1d2c62c0e432a5b9775a5 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 10 Mar 2003 17:28:52 +0000 Subject: [w3m-dev 03804] fix autoconf * acinclude.m4 (AC_W3M_MODEL): deleted (AC_W3M_COLOR): default enable (AC_W3M_ANSI_COLOR): default enable (AC_W3M_BG_COLOR): default enable (AC_W3M_SHOW_PARAMS): deleted (AC_W3M_DICT): default enable (AC_W3M_HISTORY): default enable (AC_W3M_VIEW_UNSEENOBJECTS): deleted (AC_W3M_FORMAT_NICE): deleted (AC_W3M_ID_EXT): deleted (AC_W3M_FTPPASS_HOSTNAMEGEN): deleted (AC_W3M_NNTP): default enabled (AC_W3M_LANG): autodetect whether japanese is enabled (AC_W3M_KANJI_SYMBOLS): default enabled (AC_W3M_EMACS_LIKE_LINEEDIT): deleted (AC_W3M_VI_PREC_NUM): deleted (AC_W3M_MARK): deleted (AC_W3M_LABEL_TOPLINE): deleted (AC_W3M_NEXTPAGE_TOPLINE): deleted (AC_W3M_SSL): fix without ssl (AC_W3M_IMAGE): default enabled (AC_W3M_XFACE): check uncompface (AC_W3M_IPv6): enable_ipv6 if inet6 lib found * configure.in (AC_PROG_CPP): added From: Fumitoshi UKAI --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bdfffe2..b0ffe58 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ prefix = /usr/local exec_prefix = ${prefix} bindir = ${exec_prefix}/bin datadir = ${prefix}/share -libdir = /usr/ccs/lib +libdir = ${exec_prefix}/lib includedir = ${prefix}/include infodir = ${prefix}/info libexecdir = ${exec_prefix}/libexec @@ -26,7 +26,7 @@ CFLAGS = $(OPTS) -g -O2 $(DEFS) CPPFLAGS = -I/usr/include/gc -I/usr/include/gc DEFS = -DHAVE_CONFIG_H -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(libexecdir)\" -DLIB_DIR=\"$(libdir)\" -DHELP_DIR=\"$(datadir)\" -DETC_DIR=\"$(sysconfdir)\" LDFLAGS = -LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm -lnsl -lgpm -lgc +LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm -lnsl -lgc IMGCFLAGS = -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include IMGLDFLAGS = -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -lgdk_pixbuf_xlib -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm @@ -42,15 +42,15 @@ INSTALL=/usr/bin/install -c INSTALL_PROGRAM=${INSTALL} INSTALL_SCRIPT=${INSTALL_PROGRAM} INSTALL_DATA=${INSTALL} -m 644 -INSTALL_W3MIMGDISPLAY=${INSTALL} -o root -m 4755 -s +INSTALL_W3MIMGDISPLAY=${INSTALL_PROGRAM} -HELP_FILE = w3mhelp-ja.html +HELP_FILE = w3mhelp-w3m_en.html KEYBIND_SRC = keybind.c KEYBIND_OBJ = keybind.o GCLIB=@gclib@ -VERSION=0.4.1 -MODEL=i686-pc-linux-gnu-monster-JA +VERSION=0.4.1+cvs-1.778 +MODEL=@W3M_TARGET@-@W3M_MODEL@-EN SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \ form.c map.c frame.c rc.c menu.c mailcap.c image.c \ -- cgit v1.2.3