$OpenBSD: patch-sys_unix_Makefile_src,v 1.3 2002/05/25 21:37:45 pvalchev Exp $ --- sys/unix/Makefile.src.orig Sun Jun 24 18:57:24 2001 +++ sys/unix/Makefile.src Sat May 25 15:32:08 2002 @@ -1,6 +1,7 @@ # NetHack Makefile. # SCCS Id: @(#)Makefile.src 3.3 97/04/17 +include ${NETHACKCONFIG} # newer makes predefine $(MAKE) to 'make' and do smarter processing of # recursive make calls if $(MAKE) is used # these makes allow $(MAKE) to be overridden by the environment if someone @@ -117,7 +118,7 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un # flags for Linux # compile normally -CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11/include +CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11/include -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H 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 @@ -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 -# WINTTYLIB = -lcurses +WINTTYLIB = -lcurses # WINTTYLIB = -lcurses16 -WINTTYLIB = -lncurses +# WINTTYLIB = -lncurses # WINTTYLIB = -ltermlib # # SDL libraries for Falcon's Eye -WINJTPLIB = $(shell sdl-config --libs) +WINJTPLIB = `sdl-config --libs` -lm # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 +WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 @@ -294,7 +295,7 @@ WINLIB = $(WINTTYLIB) $(WINJTPLIB) LIBS = # make NetHack -GAME = nethack +GAME = falconseye # GAME = nethack.prg # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come @@ -467,10 +468,10 @@ objects.o: # Qt windowport meta-object-compiler output qt_kde0.moc: ../include/qt_kde0.h - $(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc + moc2 ../include/qt_kde0.h > qt_kde0.moc qt_win.moc: ../include/qt_win.h - $(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc + moc2 ../include/qt_win.h > qt_win.moc $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \ ../include/objclass.h ../include/monsym.h \