Remove gmake dependency

This commit is contained in:
espie 2001-07-05 13:57:54 +00:00
parent 160c715675
commit 63f0c66deb
2 changed files with 17 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/07/05 13:29:01 espie Exp $
# $OpenBSD: Makefile,v 1.2 2001/07/05 13:57:54 espie Exp $
COMMENT= "NetHack derivative"
@ -36,7 +36,6 @@ NETHACKCONFIG= ${FILESDIR}/x-config
USE_X11= Yes
MAKE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib"
USE_GMAKE= Yes
do-configure:
@cd ${WRKSRC}/sys/unix && ${SH} setup.sh symlinks

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/05 13:29:05 espie Exp $
$OpenBSD: patch-sys_unix_Makefile_src,v 1.2 2001/07/05 13:57:57 espie Exp $
--- sys/unix/Makefile.src.orig Sun Jun 24 18:57:24 2001
+++ sys/unix/Makefile.src Wed Jul 4 23:38:00 2001
+++ sys/unix/Makefile.src Thu Jul 5 15:51:37 2001
@@ -1,6 +1,7 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.3 97/04/17
@ -18,7 +18,16 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/05 13:29:05 espie Exp $
LFLAGS = -L/usr/X11/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
@@ -232,9 +233,9 @@ WINOBJ = $(WINTTYOBJ) $(WINJTPOBJ)
@@ -146,7 +147,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
# directories. You should have sdl-config in your path; it gives the
# necessary compile and link flags.
#
-JTPINC=$(shell sdl-config --cflags)
+JTPINC=`sdl-config --cflags`
# flags for debugging:
# CFLAGS = -g -I../include
@@ -232,19 +233,19 @@ WINOBJ = $(WINTTYOBJ) $(WINJTPOBJ)
#
# libraries for tty ports
# WINTTYLIB = -ltermcap
@ -30,7 +39,10 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/05 13:29:05 espie Exp $
# WINTTYLIB = -ltermlib
#
@@ -244,7 +245,7 @@ WINJTPLIB = $(shell sdl-config --libs)
# SDL libraries for Falcon's Eye
-WINJTPLIB = $(shell sdl-config --libs)
+WINJTPLIB = `sdl-config --libs`
#
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.