--- Makefile.orig	1998-10-01 02:39:18 UTC
+++ Makefile
@@ -12,39 +12,40 @@
 
 # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
 # unless there's more than one ncurses floating around on your system
-LIBNC	= -L/usr/local/lib -lncurses
+LIBNC	= -lncurses
 
 ######### NOTE:  X11R6 or newer REQUIRED
-LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
-LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
-LIBVGA	= -L/usr/local/lib -lvgagl -lvga
+#LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
+#LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
+#LIBVGA	= -L/usr/local/lib -lvgagl -lvga
 
 # ncurses is usually in /usr/include/ncurses, but you may need
 # to use /usr/local/include/ncurses depending on your setup.
-INCNC	= -I/usr/include/ncurses
+#INCNC	= -I/usr/include/ncurses
 
 # just in case you keep your X includes in an odd location.
-INCX11	= -I/usr/X11R6/include -DNARROWPROTO
+#INCX11	= -I/usr/X11R6/include -DNARROWPROTO
 
 # stuff for sound blaster awe32
 INCAWE  = -DVOXWARE_CONTROLLER_7_WORKING
 # awe_voice.h path
-INCAWE  += -I/usr/lib/oss/include/sys
+INCAWE  += -I.
 
 # usually in /usr/include, but -I/usr/local/include doesn't hurt
 # unless there's more than one svgalib floating around your system.
-INCVGA	= -I/usr/local/include
+#INCVGA	= -I/usr/local/include
 
 # Directory where application defaults files are stored for X11 version
-XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
+#XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
 
 INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
-INSTALLDIR = /usr/bin
-INSTALL = install -s
+INSTALLDIR = ${DESTDIR}${PREFIX}/bin
+MIDI = ${DESTDIR}${PREFIX}/share/midi
+#INSTALL = install -s
 
 # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
-CFLAGS	= -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
-LDFLAGS =
+CFLAGS	+= -DMIDI=\"$(MIDI)\" $(INCAWE)
+#LDFLAGS =
 
 OBJECTS = playmidi.o readmidi.o playevents.o \
 	  patchload.o emumidi.o io_ncurses.o
@@ -58,7 +59,7 @@ SOBJECTS= playmidi.o readmidi.o playeven
 GOBJECTS= playmidi.o readmidi.o playevents.o \
 	  patchload.o emumidi.o io_gtk.o
 
-all: playmidi xplaymidi 
+all: playmidi #xplaymidi 
 
 config:
 playmidi.h: playmidi.h-dist
@@ -73,64 +74,70 @@ io_xaw.o: io_xaw.c
 io_svgalib.o: io_svgalib.c
 	$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
 
-playmidi: .depend $(OBJECTS)
+playmidi: $(OBJECTS)
 	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
 
-xplaymidi: .depend $(XOBJECTS)
+xplaymidi: $(XOBJECTS)
 	$(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
 
-gtkplaymidi: .depend $(GOBJECTS)
+gtkplaymidi: $(GOBJECTS)
 	$(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
 
-splaymidi: .depend $(SOBJECTS)
+splaymidi: $(SOBJECTS)
 	$(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
 
 $(INSTALLDIR)/playmidi: playmidi
-	$(INSTALL) playmidi $(INSTALLDIR)
+	${BSD_INSTALL_PROGRAM} playmidi $(INSTALLDIR)
 
 $(INSTALLDIR)/xplaymidi: xplaymidi
-	$(INSTALL) xplaymidi $(INSTALLDIR)
+	${BSD_INSTALL_PROGRAM} xplaymidi $(INSTALLDIR)
 
 $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
-	$(INSTALL) gtkplaymidi $(INSTALLDIR)
+	${BSD_INSTALL_PROGRAM} gtkplaymidi $(INSTALLDIR)
 
 $(INSTALLDIR)/splaymidi: splaymidi
-	$(INSTALL) splaymidi $(INSTALLDIR)
-
-/etc/std.o3:
-	cp -i std.o3 /etc
+	${BSD_INSTALL_PROGRAM} splaymidi $(INSTALLDIR)
 
-/etc/drums.o3:
-	cp -i drums.o3 /etc
+$(MIDI)/std.o3:
+	${BSD_INSTALL_DATA} std.o3 $(MIDI)       
+  
+$(MIDI)/drums.o3:
+	${BSD_INSTALL_DATA} drums.o3 $(MIDI)
 
-/etc/std.sb:
-	cp -i std.sb /etc
+$(MIDI)/std.sb:
+	${BSD_INSTALL_DATA} std.sb $(MIDI)       
 
-/etc/drums.sb:
-	cp -i drums.sb /etc
+$(MIDI)/drums.sb:
+	${BSD_INSTALL_DATA} drums.sb $(MIDI)
 
 $(XAPPDEFAULTS)/XPlaymidi:
-	cp -i XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
+	${BSD_INSTALL_DATA} XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
 
-install: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
-	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
-	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+dirs:
+	-@mkdir -p $(MIDI)
 
-install.novga: $(INSTALLDIR)/playmidi \
-	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
-	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+	 $(INSTALLDIR)/xplaymidi $(MIDI)/std.o3 $(MIDI)/drums.o3 \
+	 $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
 
-install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
-	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
+install.novga: dirs $(INSTALLDIR)/playmidi \
+	 $(INSTALLDIR)/xplaymidi $(MIDI)/std.o3 $(MIDI)/drums.o3 \
+	 $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
 
-install.Xonly: $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
-	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+install.noX11: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+	 $(MIDI)/std.o3 $(MIDI)/drums.o3 \
+	 $(MIDI)/std.sb $(MIDI)/drums.sb
 
-install.lame: $(INSTALLDIR)/playmidi \
-	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
+install.Xonly: dirs $(INSTALLDIR)/xplaymidi \
+	 $(MIDI)/std.o3 $(MIDI)/drums.o3 \
+	 $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
+
+install.lame: dirs $(INSTALLDIR)/playmidi \
+	 $(MIDI)/std.o3 $(MIDI)/drums.o3 \
+	 $(MIDI)/std.sb $(MIDI)/drums.sb
 
 install.man:
-	 cp playmidi.1 /usr/man/man1/
+	 ${BSD_INSTALL_MAN} playmidi.1 ${DESTDIR}${PREFIX}/man/man1/
 
 clean:
 	rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
@@ -138,22 +145,3 @@ clean:
 distclean: clean
 	rm -f .depend  *~ *.bak playmidi.h config.sed
 
-
-ifeq (.depend, $(wildcard .depend))
-.depend depend dep: playmidi.h
-	for i in *.c; do $(CPP) -M $(CFLAGS) $(INCLUDES) $$i; done >.depend
-
-include .depend
-else
-depend dep:
-	for i in *.c; do $(CPP) -M $(CFLAGS) $(INCLUDES) $$i; done >.depend
-
-.depend: playmidi.h
-	@echo
-	@echo "Bad or missing .depend running 'make depend clean'"
-	@echo
-	$(MAKE) depend clean
-	@echo
-	@echo "Successful.  Trying to make again"
-	@exit 0
-endif