From 9cc32532df2c4a3db1a094c460a8299c3f2a66eb Mon Sep 17 00:00:00 2001 From: jseger Date: Tue, 13 Oct 1998 02:48:49 +0000 Subject: Unbreak for ELF. Submitted by: steve --- print/asprint/files/patch-aa | 66 +++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) (limited to 'print/asprint/files') diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-aa index 50728293cc3..218c399741a 100644 --- a/print/asprint/files/patch-aa +++ b/print/asprint/files/patch-aa @@ -1,37 +1,29 @@ -*** makefile Fri Mar 14 03:34:48 1997 ---- makefile Sat Aug 16 18:23:57 1997 -*************** -*** 2,18 **** - - CFLAGS = -O2 - CC = gcc -! XLIB = -L/usr/X11/lib -lXaw3d -lXmu -lXt -! - OBJS = asprint.o -! INCS = -! -! default : asprint ./makefile -! clean: -! rm -f $(OBJS) *~ asprint core - - asprint: $(OBJS) - $(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB) - - .c.o: -! $(CC) $(CFLAGS) -c $< ---- 2,16 ---- - - CFLAGS = -O2 - CC = gcc -! XLIB = -L/usr/X11R6/lib -lXaw -lXmu -lXt - OBJS = asprint.o -! INCS = -I/usr/X11R6/include - - asprint: $(OBJS) - $(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB) - -+ clean: -+ rm -f $(OBJS) *~ asprint core -+ - .c.o: -! $(CC) $(CFLAGS) -c $(INCS) $< +--- makefile.orig Fri Mar 14 04:34:48 1997 ++++ makefile Mon Oct 12 19:17:11 1998 +@@ -2,17 +2,18 @@ + + CFLAGS = -O2 + CC = gcc +-XLIB = -L/usr/X11/lib -lXaw3d -lXmu -lXt +- ++XLIB = -L$(X11BASE)/lib -lXaw -lXmu -lXt ++.if $(PORTOBJFORMAT) == "elf" ++XLIB+= -Wl,-rpath,$(X11BASE)/lib ++.endif + OBJS = asprint.o +-INCS = +- +-default : asprint ./makefile +-clean: +- rm -f $(OBJS) *~ asprint core ++INCS = -I$(X11BASE)/include + + asprint: $(OBJS) + $(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB) + ++clean: ++ rm -f $(OBJS) *~ asprint core ++ + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -c $(INCS) $< -- cgit