--- Makefile.orig	1996-05-26 09:26:46 UTC
+++ Makefile
@@ -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 = ${PREFIX}/bin
 
 # Where to install the manual pages
-MAN_DIR = /usr/local/man/man1
+MAN_DIR = ${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 = ${PREFIX}/lib/timidity
 
 # Where to install the Tcl code, if you use the Tcl code that is.
 TCL_DIR = $(TIMID_DIR)
@@ -112,9 +112,9 @@ EXTRALIBS += -lncurses
 #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 +136,7 @@ DISTZIP = timid$(FNVERSION).zip
 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?
@@ -220,7 +220,7 @@ spotless: clean
 	$(CC) $(CFLAGS) -c $<
 
 $(PROJ): $(COBJS)
-	$(CC) $(CFLAGS) -o $(PROJ) $(COBJS) $(EXTRALIBS) -lm
+	$(CC) $(CFLAGS) -o $(PROJ) $(COBJS) $(LDFLAGS) $(EXTRALIBS) -lm
 
 bag: bag.c
 	$(CC) $(CFLAGS) -o bag bag.c
@@ -228,10 +228,10 @@ bag: bag.c
 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
 
@@ -249,22 +249,22 @@ install.all: install.bin install.man ins
 
 # install.bin: $(PROJ) Dumb make thinks it has to have $(COBJS) to install...
 install.bin:
-	mkdir -p $(BIN_DIR)
-	$(INSTALL) -s -m 755 $(PROJ) $(TOOLS) $(BIN_DIR)
+	mkdir -p $(DESTDIR)$(BIN_DIR)
+	$(INSTALL) -s -m 755 $(PROJ) $(TOOLS) $(DESTDIR)$(BIN_DIR)
 
 install.man:
-	mkdir -p $(MAN_DIR)
-	$(INSTALL) -m 644 $(MANPAGES) $(MAN_DIR)
+	mkdir -p $(DESTDIR)$(MAN_DIR)
+	$(INSTALL) -m 644 $(MANPAGES) $(DESTDIR)$(MAN_DIR)
 
 install.lib: install.config install.patch $(INST_TK)
 
 install.config: $(CONFIGF)
-	mkdir -p $(TIMID_DIR)
-	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+	mkdir -p $(DESTDIR)$(TIMID_DIR)
+	$(INSTALL) -m 644 $(CONFIGF) $(DESTDIR)$(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)