$NetBSD: patch-aa,v 1.4 2004/03/09 23:06:18 snj Exp $

--- Makefile.orig	1998-03-05 14:06:19.000000000 -0800
+++ Makefile	2004-03-09 15:02:02.000000000 -0800
@@ -21,14 +21,15 @@
 ### GENERAL OPTIONS ###
 
   # Compiler to use (C++ compiler _please_)
-  CC = g++
+  CC = ${CXX}
 
   # Directory for XNibbles specific data
   # This must be set correctly at compile time
-  DATADIR = /usr/local/games/xnibbles
+  DATADIR=$(PREFIX)/share/xnibbles
+  CPPFLAGS+=-DDATADIR=\"$(DATADIR)\" $(SDEV)
+  CFLAGS+=-fwritable-strings
 
   # Prefix to find bin and man directories for installation
-  PREFIX  = /usr/local
 
   # Install program
   INSTALL = /usr/bin/install
@@ -41,10 +42,10 @@
 
   # Requires kernel sound support, change from 0 to 1 if you want it
   SOUND = 1
-  SOUNDDEV = /dev/dsp
+  SOUNDDEV = /dev/audio
 
   # Requires kernel joystick support, change from 0 to 1 if you want it
-  JOYSTICK = 1
+  JOYSTICK = 0
   JOYSTICK0DEV = /dev/js0
   JOYSTICK1DEV = /dev/js1
 
@@ -90,7 +91,7 @@ xnibbles: bodyPart.o boni.o bonus.o dead
 	$(CC) $(CFLAGS) $(LDFLAGS) \
 	bodyPart.o boni.o bonus.o levels.o people.o statusBar.o ticker.o \
 	timer.o walls.o worm.o xnibbles.o xpms.o $(OBJECTS) deadWorm.o counter.o \
-	-o xnibbles -lm -lXpm -lX11
+	-o xnibbles -lm -lXpm -lX11 ${LIBOSSAUDIO}
 
 xnleditor: xnleditor/level.o xnleditor/newWalls.o xnleditor/sideBar.o xnleditor/walls.o xnleditor/xnleditor.o xnleditor/xpms.o xnleditor/numericDisplay.o
 	$(CC) $(CFLAGS) $(LDFLAGS) \
@@ -115,19 +116,14 @@ tar: pristine
 	(cd ..; tar -cvzf xnibbles.tgz xnibbles/ ; chmod 644 xnibbles.tgz)
 
 install:
-	$(INSTALL) -d $(DATADIR) -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -d $(DATADIR)/levels -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -d $(DATADIR)/sounds -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -d $(PREFIX) -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -d $(PREFIX)/bin -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -d $(PREFIX)/man -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -d $(PREFIX)/man/man6 -g $(GROUP) -m 755 -o $(USER)
-	$(INSTALL) -g $(GROUP) -m 644 -o $(USER) levels/*.xnl $(DATADIR)/levels
-	$(INSTALL) -g $(GROUP) -m 644 -o $(USER) levels/README $(DATADIR)/levels
-	$(INSTALL) -g $(GROUP) -m 644 -o $(USER) sounds/*.ub $(DATADIR)/sounds
-	$(INSTALL) -g $(GROUP) -m 755 -o $(USER) xnibbles $(PREFIX)/bin
-	$(INSTALL) -g $(GROUP) -m 755 -o $(USER) xnleditor/xnleditor $(PREFIX)/bin
-	$(INSTALL) -g $(GROUP) -m 644 -o $(USER) xnibbles.6 $(PREFIX)/man/man6
+	$(BSD_INSTALL_DATA_DIR) $(DATADIR)/levels
+	$(BSD_INSTALL_DATA_DIR) $(DATADIR)/sounds
+	$(BSD_INSTALL_DATA) levels/*.xnl $(DATADIR)/levels
+	$(BSD_INSTALL_DATA) levels/README $(DATADIR)/levels
+	$(BSD_INSTALL_DATA) sounds/*.ub $(DATADIR)/sounds
+	$(BSD_INSTALL_PROGRAM) xnibbles $(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) xnleditor/xnleditor $(PREFIX)/bin
+	$(BSD_INSTALL_MAN) xnibbles.6 $(PREFIX)/man/man6
 	./make-LEVELS $(DATADIR) OOGA
 
 bodyPart.o:	common.h bodyPart.h