use -L$(X11BASE)/lib for linking, fixes build on macppc (failure pointed

out by ajacoutot). bump PKGNAME (possibly gratuitously).
This commit is contained in:
sthen 2009-04-05 11:58:38 +00:00
parent a7bd5d8ac0
commit a831ae1adb
2 changed files with 4 additions and 4 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/11 13:30:44 sthen Exp $
# $OpenBSD: Makefile,v 1.2 2009/04/05 11:58:38 sthen Exp $
SHARED_ONLY = Yes
COMMENT = cross-platform interactive fiction player
DISTNAME = gargoyle-2008-12-25-sources
PKGNAME = gargoyle-20081225
PKGNAME = gargoyle-20081225p0
# not a libtool port; any additional libs will need further changes.
SHARED_LIBS = garglk 0.0

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Jamrules,v 1.1.1.1 2009/02/11 13:30:44 sthen Exp $
$OpenBSD: patch-Jamrules,v 1.2 2009/04/05 11:58:38 sthen Exp $
--- Jamrules.orig Mon Dec 22 15:19:34 2008
+++ Jamrules Wed Jan 21 14:29:25 2009
@@ -7,8 +7,8 @@ BUILD ?= RELEASE ;
@ -24,7 +24,7 @@ $OpenBSD: patch-Jamrules,v 1.1.1.1 2009/02/11 13:30:44 sthen Exp $
+ SHELLHEADER = "#!/bin/sh" ;
+ GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" -fPIC ;
+ SHRLINKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
+ LINKLIBS = -L$(PREFIX)/lib -lz ;
+ LINKLIBS = -L$(PREFIX)/lib -L$(X11BASE)/lib -lz ;
+
+ if $(USESDL)
+ {