diff options
| author | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 02:48:49 +0000 |
|---|---|---|
| committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 02:48:49 +0000 |
| commit | aefc85c8242e792d10960165222f279e4a11e884 (patch) | |
| tree | c30f4370a5071c5c037b5d59a5070584bcf87ca6 /print/asprint | |
| parent | Unbreak for ELF. (diff) | |
Unbreak for ELF.
Submitted by: steve
Notes
Notes:
svn path=/head/; revision=13931
Diffstat (limited to 'print/asprint')
| -rw-r--r-- | print/asprint/Makefile | 4 | ||||
| -rw-r--r-- | print/asprint/files/patch-aa | 66 |
2 files changed, 30 insertions, 40 deletions
diff --git a/print/asprint/Makefile b/print/asprint/Makefile index aff8964c1d49..b285441da320 100644 --- a/print/asprint/Makefile +++ b/print/asprint/Makefile @@ -3,7 +3,7 @@ # Date created: 16 August 1997 # Whom: brett@peloton.physics.montana.edu # -# $Id: Makefile,v 1.2 1998/08/05 09:31:37 asami Exp $ +# $Id: Makefile,v 1.3 1998/10/12 12:33:23 jseger Exp $ # DISTNAME= asprint @@ -17,8 +17,6 @@ USE_X_PREFIX= yes ALL_TARGET= asprint MAKEFILE= makefile -BROKEN_ELF= yes - do-install: ${INSTALL_PROGRAM} $(WRKSRC)/asprint ${PREFIX}/bin diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-aa index 50728293cc32..218c399741ae 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) $< |