$NetBSD: patch-aa,v 1.4 2005/05/07 23:04:17 dillo Exp $ --- Makefile.orig 2005-01-18 08:28:22.000000000 +0100 +++ Makefile @@ -50,9 +50,9 @@ CFG_OPTIONS=-DDO_COLOR # Standard optimizations # Pentium with gcc 2.7.0 or better #CFLAGS=-O2 -Wall -fomit-frame-pointer -malign-functions=2 -malign-loops=2 -malign-jumps=2 -CFLAGS=-O2 -Wall +#CFLAGS=-O2 -Wall # If you are using the ncurses package, define NCURSES for the compiler -CFLAGS:=$(CFLAGS) -DNCURSES -DGCC_UNIX -DUSE_TEMPFILES +CFLAGS:=$(CFLAGS) -DNCURSES -DGCC_UNIX -DUSE_TEMPFILES -DHUGO_LIBDIR=\"$(PREFIX)/share/hugo\" ifeq ($(MAKECMDGOALS), he) CFLAGS:=$(CFLAGS) -DNO_LATIN1_CHARSET endif @@ -62,7 +62,8 @@ endif # If you need a special include path to get the right curses header, specify # it. -CC=gcc -I/usr/local/include -Isource $(CFG_OPTIONS) $(CFLAGS) +#CC=gcc -I/usr/local/include -Isource $(CFG_OPTIONS) $(CFLAGS) +CC:=$(CC) -I$(PREFIX)/include -Isource $(CFG_OPTIONS) $(CFLAGS) # If using ncurses you need -lncurses, otherwise use -lcurses. You may also # need -ltermcap or -ltermlib. If you need to specify a particular path to @@ -71,7 +72,7 @@ CC=gcc -I/usr/local/include -Isource $(C #HE_LIBS=-lcurses -ltermcap #HE_LIBS=-lcurses -ltermlib #HE_LIBS=-lcurses -HE_LIBS=-lncurses +HE_LIBS=-L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}$(PREFIX)/lib -lncurses # Shouldn't need to change anything below here. HC_H=$(SOURCE)/hcheader.h $(SOURCE)/htokens.h @@ -100,17 +101,17 @@ clean: hc: $(HC_OBJS) # gcc -g -o hc $(HC_OBJS) - gcc -o hc $(HC_OBJS) + $(CC) -o hc $(HC_OBJS) he: $(HE_OBJS) # gcc -g -static -o he $(HE_OBJS) $(HE_LIBS) # gcc -g -o he $(HE_OBJS) $(HE_LIBS) - gcc -o he $(HE_OBJS) $(HE_LIBS) + $(CC) -o he $(HE_OBJS) $(HE_LIBS) hd: $(HE_OBJS) $(HD_OBJS) # gcc -g -static -o hd $(HD_OBJS) $(HE_LIBS) # gcc -g -o hd $(HD_OBJS) $(HE_LIBS) - gcc -o hd $(HE_OBJS) $(HD_OBJS) $(HE_LIBS) + $(CC) -o hd $(HE_OBJS) $(HD_OBJS) $(HE_LIBS) iotest: $(SOURCE)/iotest.c gcc/hegcc.c $(HE_H) $(CC) -o iotest $(SOURCE)/iotest.c hegcc.o stringfn.o $(HE_LIBS)