--- Makefile.in	1996-10-09 23:32:36.000000000 -0400
+++ Makefile.in	2012-04-07 12:07:34.000000000 -0400
@@ -11,7 +11,7 @@
 
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
-TCL_BIN_DIR = @TCL_BIN_DIR@
+TCL_BIN_DIR = ${TCL_LIBDIR}
 
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
@@ -35,8 +35,9 @@
 VPATH = @srcdir@
 
 CFLAGS = @CFLAGS@ @DEFS@
-CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} \
+CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} \
     -Idevice -Ievents -Irb -Ipatch -Ismf -Isong -I.
+CXX_SWITCHES= ${CC_SWITCHES} ${CXXFLAGS}
 
 TCLMFILES = tclmCmd.o tclmUtil.o tclmEvnt.o tclmPlay.o tclmPtch.o TclmIntp.o
 TCLMFILES_SRC = tclmCmd.cxx tclmUtil.cxx tclmEvnt.cxx tclmPlay.cxx \
@@ -61,7 +62,7 @@
 	@echo 'pkg_mkIndex . $(PROJ_LIB_NAME)' | @TCLSH_PATH@
 
 .cxx.o:
-	@CXX@ -c $(CC_SWITCHES) $<
+	@CXX@ -c $(CXX_SWITCHES) $<
 
 $(PROJ_LIB_NAME): events/objs smf/objs \
     song/objs device/objs patch/objs rb/objs $(TCLMFILES)
@@ -101,7 +102,7 @@
 
 install: $(PROJ_LIB_NAME) $(SCRIPTS)
 	-mkdir -p $(prefix)$(libdir)/tclmidi
-	@INSTALL_DATA@ $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
+	@INSTALL_DATA@ -s $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
 	echo 'pkg_mkIndex $(prefix)$(libdir)/tclmidi \
 	    $(PROJECT)*${SHLIB_SUFFIX}' | @TCLSH_PATH@
 	cd man; $(MAKE) install
@@ -128,7 +129,7 @@
 	sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp
 	echo >> Makefile.tmp
 	echo "##" "Dependancies" >> Makefile.tmp
-	@CXX@ -M $(CC_SWITCHES) $(TCLMFILES_SRC) >> Makefile.tmp
+	@CXX@ -M $(CXX_SWITCHES) $(TCLMFILES_SRC) >> Makefile.tmp
 	cp Makefile.tmp Makefile
 	rm Makefile.tmp
 
--- device/Makefile.in	1996-10-09 23:32:40.000000000 -0400
+++ device/Makefile.in	2012-04-07 12:13:09.000000000 -0400
@@ -18,4 +18,5 @@
     -I$(srcdir)/../events -I$(srcdir)/../rb -I$(srcdir)/../patch \
     -I$(srcdir)/../smf -I$(srcdir)/../song -I$(srcdir)/.. -I$(srcdir)
+CXX_SWITCHES= ${CC_SWITCHES} ${CXXFLAGS}
 
 DEVICEFILES = MidiDev.o TclmDr75.o
@@ -25,5 +26,5 @@
 
 .cxx.o:
-	@CXX@ -c $(CC_SWITCHES) $<
+	@CXX@ -c $(CXX_SWITCHES) $<
 
 objs: $(DEVICEFILES)
@@ -34,5 +35,5 @@
 	echo >> Makefile.tmp
 	echo "##" "Dependancies" >> Makefile.tmp
-	@CXX@ -M $(CC_SWITCHES) $(DEVICEFILES_SRC) >> Makefile.tmp
+	@CXX@ -M $(CXX_SWITCHES) $(DEVICEFILES_SRC) >> Makefile.tmp
 	cp Makefile.tmp Makefile
 	rm Makefile.tmp
--- events/Makefile.in	1996-10-09 23:32:42.000000000 -0400
+++ events/Makefile.in	2012-04-07 12:15:41.000000000 -0400
@@ -17,4 +17,5 @@
 CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \
     -I$(srcdir)/../smf -I$(srcdir)/../song -I$(srcdir)/.. -I$(srcdir)
+CXX_SWITCHES = ${CC_SWITCHES} ${CXXFLAGS}
 
 EVENTFILES = ChanPres.o Event.o MChanPrf.o MCopy.o MCue.o \
@@ -36,5 +37,5 @@
 
 .cxx.o:
-	@CXX@ -c $(CC_SWITCHES) $<
+	@CXX@ -c $(CXX_SWITCHES) $<
 
 objs: $(EVENTFILES)
@@ -45,5 +46,5 @@
 	echo >> Makefile.tmp
 	echo "##" "Dependancies" >> Makefile.tmp
-	@CXX@ -M $(CC_SWITCHES) $(EVENTFILES_SRC) >> Makefile.tmp
+	@CXX@ -M $(CXX_SWITCHES) $(EVENTFILES_SRC) >> Makefile.tmp
 	cp Makefile.tmp Makefile
 	rm Makefile.tmp
--- patch/Makefile.in	1996-10-09 23:32:43.000000000 -0400
+++ patch/Makefile.in	2012-04-07 12:23:29.000000000 -0400
@@ -17,4 +17,5 @@
 CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \
     -I. -I..
+CXX_SWITCHES = ${CC_SWITCHES} ${CXXFLAGS}
 
 PATCHFILES = GusPatch.o
@@ -24,5 +25,5 @@
 
 .cxx.o:
-	@CXX@ -c $(CC_SWITCHES) $<
+	@CXX@ -c $(CXX_SWITCHES) $<
 
 objs: $(PATCHFILES)
@@ -33,5 +34,5 @@
 	echo >> Makefile.tmp
 	echo "##" "Dependancies" >> Makefile.tmp
-	@CXX@ -M $(CC_SWITCHES) $(PATCHFILES_SRC) >> Makefile.tmp
+	@CXX@ -M $(CXX_SWITCHES) $(PATCHFILES_SRC) >> Makefile.tmp
 	cp Makefile.tmp Makefile
 	rm Makefile.tmp