- don't hardcode paths

- sanitise PKGNAME
This commit is contained in:
ajacoutot 2009-06-06 04:53:39 +00:00
parent d5e5b6274c
commit 647c8228f1
2 changed files with 9 additions and 4 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/06/06 04:44:10 landry Exp $
# $OpenBSD: Makefile,v 1.2 2009/06/06 04:53:39 ajacoutot Exp $
COMMENT= turns your keyboard into an fast pointer mover
DISTNAME= keynav-20080614.01
PKGNAME= ${DISTNAME:S/.//}p0
CATEGORIES= x11
HOMEPAGE= http://www.semicomplete.com/projects/keynav/
@ -19,8 +20,12 @@ USE_X11= Yes
WANTLIB= X11 Xau Xdmcp Xext Xtst c
NO_REGRESS= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/keynav ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/keynav
${INSTALL_DATA} ${WRKSRC}/keynavrc ${PREFIX}/share/examples/keynav/
.include <bsd.port.mk>

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2009/06/06 04:44:10 landry Exp $
$OpenBSD: patch-Makefile,v 1.2 2009/06/06 04:53:39 ajacoutot Exp $
--- Makefile.orig Fri Jun 5 22:27:03 2009
+++ Makefile Fri Jun 5 22:31:54 2009
@@ -1,5 +1,5 @@
-CFLAGS=`pkg-config --cflags x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
-LDFLAGS=`pkg-config --libs x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst`
+CFLAGS+=`pkg-config --cflags x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
+LDFLAGS+=`pkg-config --libs x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst`
+CFLAGS+=`pkg-config --cflags x11 xtst 2> /dev/null || echo -I${X11BASE}/include -I${LOCALBASE}/include`
+LDFLAGS+=`pkg-config --libs x11 xtst 2> /dev/null || echo -L${X11BASE}/lib -L${LOCALBASE}/lib -lX11 -lXtst`
#CFLAGS+=-g
OTHERFILES=README CHANGELIST COPYRIGHT \