kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unbreak for ELF.

Browse source 
Submitted by:	steve
This commit is contained in:
Justin M. Seger 1998-10-13 02:48:49 +00:00
parent 1f49964c20
commit aefc85c824
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=13931
2 changed files with 30 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
print/asprint/Makefile
View file

@ -3,7 +3,7 @@
# Date created: 16 August 1997 # Date created: 16 August 1997
# Whom: brett@peloton.physics.montana.edu # 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 DISTNAME= asprint
@ -17,8 +17,6 @@ USE_X_PREFIX= yes
ALL_TARGET= asprint ALL_TARGET= asprint
MAKEFILE= makefile MAKEFILE= makefile
BROKEN_ELF= yes
do-install: do-install:
${INSTALL_PROGRAM} $(WRKSRC)/asprint ${PREFIX}/bin ${INSTALL_PROGRAM} $(WRKSRC)/asprint ${PREFIX}/bin

44
print/asprint/files/patch-aa
View file

@ -1,37 +1,29 @@
*** makefile Fri Mar 14 03:34:48 1997 --- makefile.orig Fri Mar 14 04:34:48 1997
--- makefile Sat Aug 16 18:23:57 1997 +++ makefile Mon Oct 12 19:17:11 1998
*************** @@ -2,17 +2,18 @@
*** 2,18 ****
CFLAGS = -O2 CFLAGS = -O2
CC = gcc CC = gcc
! XLIB = -L/usr/X11/lib -lXaw3d -lXmu -lXt -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 OBJS = asprint.o
! INCS = -INCS =
! -
! default : asprint ./makefile -default : asprint ./makefile
! clean: -clean:
! rm -f $(OBJS) *~ asprint core - rm -f $(OBJS) *~ asprint core
+INCS = -I$(X11BASE)/include
asprint: $(OBJS) asprint: $(OBJS)
$(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB) $(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB)
.c.o: +clean:
! $(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 + rm -f $(OBJS) *~ asprint core
+ +
.c.o: .c.o:
! $(CC) $(CFLAGS) -c $(INCS) $< - $(CC) $(CFLAGS) -c $<
+ $(CC) $(CFLAGS) -c $(INCS) $<