diff -u ../timidity-0.2i/Makefile ./Makefile
--- ../timidity-0.2i/Makefile	Sun May 26 04:26:46 1996
+++ ./Makefile	Fri Feb  5 11:59:22 1999
@@ -24,22 +24,22 @@
 # But where to change without revealing my secret identity?
 
 ########### Compiler and flags.
-CC = gcc
-DEBUGFLAGS = -Wall -O2
+#CC = gcc
+DEBUGFLAGS = -Wall
 
 ########### Install.
-INSTALL = /usr/bin/install
+#INSTALL = /usr/bin/install
 
 # Where to install the executable
-BIN_DIR = /usr/local/bin
+BIN_DIR = ${DESTDIR}${PREFIX}/bin
 
 # Where to install the manual pages
-MAN_DIR = /usr/local/man/man1
+MAN_DIR = ${DESTDIR}${PREFIX}/man/man1
 
 # Where to install the patches, config files, and MIDI files.
 # If you change this, it's a good idea to recompile the binary,
 # or you'll need to invoke timidity with the -L option.
-TIMID_DIR = /usr/local/lib/timidity
+TIMID_DIR = ${DESTDIR}${PREFIX}/lib/timidity
 
 # Where to install the Tcl code, if you use the Tcl code that is.
 TCL_DIR = $(TIMID_DIR)
@@ -59,6 +59,10 @@
 #EXTRAINCS +=
 #EXTRALIBS += 
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+EXTRALIBS += -lossaudio
+#endif
+
 ## Select the HP-UX network audio server
 #SYSTEM += -DHPUX -DAU_HPUX
 #SYSEXTRAS += hpux_a.c
@@ -91,10 +95,10 @@
 # messages.
 
 # Select the ncurses full-screen interface
-SYSTEM += -DIA_NCURSES
-SYSEXTRAS += ncurs_c.c
-EXTRAINCS += -I/usr/include/ncurses
-EXTRALIBS += -lncurses
+#SYSTEM += -DIA_NCURSES
+#SYSEXTRAS += ncurs_c.c
+#EXTRAINCS += -I/usr/include/ncurses
+#EXTRALIBS += -lncurses -lmytinfo
 
 ## Select the S-Lang full-screen interface
 #SYSTEM += -DIA_SLANG
@@ -102,19 +106,19 @@
 #EXTRAINCS += -I/usr/include/slang
 #EXTRALIBS += -lslang
 
-## Select the MOTIF interface
-#SYSTEM += -DMOTIF
-#SYSEXTRAS += motif_c.c motif_i.c motif_p.c
-#EXTRAINCS += -I/usr/local/X11R5/include -L/usr/local/X11R5/lib
-#EXTRAINCS += -I/usr/include/X11
-#EXTRALIBS += -lXm -lXt -lX11
-## Solaris needs libgen?
+# Select the MOTIF interface
+SYSTEM += -DMOTIF
+SYSEXTRAS += motif_c.c motif_i.c motif_p.c
+EXTRAINCS += -I/usr/local/include -L/usr/local/lib
+EXTRAINCS += -I/usr/X11R6/include -L/usr/X11R6/lib
+EXTRALIBS += -lXm -lXt -lX11
+# Solaris needs libgen?
 #EXTRALIBS += -lgen
 
 # Select the Tcl/Tk interface
-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-SYSEXTRAS += tk_c.c
-INST_TK = install.tk
+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+#SYSEXTRAS += tk_c.c
+#INST_TK = install.tk
 #EXTRAINCS +=
 #EXTRALIBS +=
 
@@ -136,7 +140,7 @@
 SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 SDISTZIP = tilib$(FNSUPPVERSION).zip
 
-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 
 ########### All relevant files.. Anybody know autoconf?
@@ -228,10 +232,10 @@
 wav2pat: wav2pat.c
 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 
-depends depend dep:
-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-
-include depends
+#depends depend dep:
+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+#
+#include depends
 
 ########### Installation targets
 
@@ -262,9 +266,9 @@
 	mkdir -p $(TIMID_DIR)
 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 
-install.patch: $(PATCHF)
-	mkdir -p $(TIMID_DIR)/patch
-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+install.patch: #$(PATCHF)
+#        mkdir -p $(TIMID_DIR)/patch
+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 
 install.tk: $(ALLTCLF)
 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
