From 2dcd6ae2214c63d31cc4cf9dbd5304658ea45b07 Mon Sep 17 00:00:00 2001 From: FUJISHIMA Satsuki Date: Mon, 12 Mar 2001 18:10:32 +0000 Subject: fix build error caused by xforms change. PR: 25697 Submitted by: maintainer --- ftp/xrmftp/files/patch-aa | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ftp/xrmftp/files/patch-aa') diff --git a/ftp/xrmftp/files/patch-aa b/ftp/xrmftp/files/patch-aa index 0c772436f688..817b793bd0c1 100644 --- a/ftp/xrmftp/files/patch-aa +++ b/ftp/xrmftp/files/patch-aa @@ -1,19 +1,18 @@ ---- Makefile Tue Nov 17 19:25:43 1998 -+++ Makefile.new Sat Apr 1 06:43:11 2000 +--- Makefile.orig Tue Nov 17 19:25:43 1998 ++++ Makefile Sun Mar 11 05:59:19 2001 @@ -1,17 +1,20 @@ -CC=gcc -XFORMSLIBPATH=/usr/X11R6/lib # path to xforms library -XFORMSINCPATH=/usr/X11R6/include # path to xforms header file -XLIBSPATH=/usr/X11R6/lib # path to standard X libraries -XINCPATH=/usr/X11R6/include # path to standard X header files --LIBS= -lm -lX11 -lforms # libraries +X11BASE?=/usr/X11R6 +CC ?=gcc +XFORMSLIBPATH=${X11BASE}/lib # path to xforms library +XFORMSINCPATH=${X11BASE}/include # path to xforms header file +XLIBSPATH=${X11BASE}/lib # path to standard X libraries +XINCPATH=${X11BASE}/include # path to standard X header files -+LIBS= -lm -lX11 -lxforms # libraries + LIBS= -lm -lX11 -lforms # libraries #EXTRALIBS=-lnsl -lsocket # additional libraries needed by some unices SRC=xftp.c fd_xftp.c OBJ=$(SRC:.c=.o) @@ -21,7 +20,7 @@ -CFLAGS=-I/usr/include -I${XFORMSINCPATH} -I${XINCPATH} -LDFLAGS=-L/usr/lib -L${XLIBSPATH} ${LIBS} ${EXTRALIBS} -L${XFORMSLIBPATH} -O3 +CFLAGS +=-I/usr/include -I${XFORMSINCPATH} -I${XINCPATH} -+LDFLAGS =-L/usr/lib -L${XLIBSPATH} ${LIBS} ${EXTRALIBS} -L${XFORMSLIBPATH} -O3 ++LDFLAGS =-L/usr/lib -L${XLIBSPATH} ${LIBS} ${EXTRALIBS} -L${XFORMSLIBPATH} #------------------------------------------------------------------------------ + -- cgit v1.2.3