1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Fix build for ELF.

This commit is contained in:
Steve Price 1998-09-28 02:17:33 +00:00
parent d0bcea0fbd
commit c1e62c442c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13497
3 changed files with 15 additions and 9 deletions

View File

@ -3,7 +3,7 @@
# Date created: 21 May 1998
# Whom: Andrey Zakhvatov
#
# $Id: Makefile,v 1.3 1998/08/07 23:56:21 asami Exp $
# $Id: Makefile,v 1.4 1998/08/12 06:29:28 asami Exp $
#
DISTNAME= pp-0.01
@ -19,7 +19,7 @@ USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/ppsrc
pre-build:
@ cd ${WRKSRC}; make depend
@ cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} depend
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/pp ${PREFIX}/bin/pp.bin

View File

@ -1,6 +1,6 @@
--- Makefile Sat Apr 5 17:08:26 1997
+++ /home/andy/tmp/wrk/Makefile Mon Jun 8 22:35:44 1998
@@ -1,10 +1,10 @@
--- Makefile.orig Sat Apr 5 11:08:26 1997
+++ Makefile Sun Sep 27 15:25:36 1998
@@ -1,10 +1,13 @@
####### This section was automatically generated from
-INCDIR = $(QTDIR)/include
@ -10,6 +10,9 @@
YACCCFLAGS = -Wno-unused -Wno-parentheses
-LFLAGS = -L$(QTDIR)/lib -lqt
+LFLAGS = -L${X11BASE}/lib -lqt
+.if ${PORTOBJFORMAT} == "elf"
+LFLAGS+= -Wl,-rpath,${X11BASE}/lib
+.endif
CC = gcc
MOC = moc
SHELL = /bin/sh

View File

@ -1,6 +1,6 @@
--- Makefile.orig Sat Jan 20 22:02:46 1996
+++ Makefile Fri Feb 20 10:27:38 1998
@@ -12,33 +12,27 @@
--- Makefile.orig Sat Jan 20 15:02:46 1996
+++ Makefile Sun Sep 27 03:06:34 1998
@@ -12,33 +12,30 @@
# for conditions under which this file may be redistributed.
#
@ -17,6 +17,9 @@
-
-COMPILE=$(CC) -c $(CFLAGS)
+XLIB=-L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 -lcompat
+.if ${PORTOBJFORMAT} == "elf"
+XLIB+= -Wl,-rpath,${X11BASE}/lib
+.endif
LINK=$(CC)
@ -39,7 +42,7 @@
xbomb.o : xbomb.c xbomb.h
xwindow.o : xwindow.c xbomb.h icon.h
hiscore.o : hiscore.c xbomb.h
@@ -54,7 +48,7 @@
@@ -54,7 +51,7 @@
strip xbomb
install -d $(INSTDIR)/bin
install -d $(INSTDIR)/man/man6