$NetBSD: patch-aq,v 1.1 2005/03/19 12:52:28 schwarz Exp $ --- pine/makefile.sgi.orig 2004-12-11 23:35:09.000000000 +0100 +++ pine/makefile.sgi 2004-12-11 23:43:26.000000000 +0100 @@ -47,9 +47,11 @@ MAKE= make OPTIMIZE= # -O PROFILE= # -pg -DEBUG= -g -DDEBUG +DEBUG= -DDEBUG # -g -CCLIENTDIR= ../c-client +CCLIENTDIR= ${PREFIX} +CCLIENTINC= ${CCLIENTDIR}/include/c-client +CCLIENTLIB= ${CCLIENTDIR}/lib PICODIR= ../pico # Only need to uncomment next two lines if you run make from this directory @@ -63,14 +65,13 @@ # Uncomment the line below *if* you're running IRIX < 5.0 *and* your # site is using NIS. #EXTRASTDLIBES= -lsun -STDLIBS= -ltermlib $(EXTRASTDLIBES) -LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a -LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \ - `cat $(CCLIENTDIR)/LDFLAGS` +STDLIBS= -ltermlib -lssl -lcrypto -lcrypt $(EXTRASTDLIBES) +LOCLIBS= -lpico -lc-client +LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) STDCFLAGS= -DSGI -DSYSTYPE=\"SGI\" -DMOUSE CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \ - $(LOCALPINECFLAGS) $(STDCFLAGS) + $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC} OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \ folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \ @@ -82,20 +83,20 @@ $(PICODIR)/headers.h $(PICODIR)/estruct.h \ $(PICODIR)/edef.h $(PICODIR)/efunc.h \ $(PICODIR)/pico.h $(PICODIR)/os.h \ - $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \ - $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h + $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \ + $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h all: pine rpload rpdump -pine: $(OFILES) $(LOCLIBS) +pine: $(OFILES) echo "char datestamp[]="\"`date`\"";" > date.c echo "char hoststamp[]="\"`hostname`\"";" >> date.c $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS) -rpload: rpload.o $(CCLIENTDIR)/c-client.a +rpload: rpload.o $(CCLIENTDIR)/libc-client.a $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS) -rpdump: rpdump.o $(CCLIENTDIR)/c-client.a +rpdump: rpdump.o $(CCLIENTDIR)/libc-client.a $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS) pine-use: pine-use.c @@ -115,8 +116,8 @@ $(OFILES): $(HFILES) addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h -context.o: $(CCLIENTDIR)/misc.h -send.o: $(CCLIENTDIR)/smtp.h +context.o: $(CCLIENTINC)/misc.h +send.o: $(CCLIENTINC/smtp.h #$(LDAPOFILES): $(LDAPLIBS) helptext.c: pine.hlp