--- Makefile.in.orig	Thu Apr 15 07:31:17 2004
+++ Makefile.in	Sat Apr 17 21:52:56 2004
@@ -50,7 +50,7 @@
 
 # To change the compiler switches, for example to change from -O
 # to -g, change the following line:
-CC_OPTS = -O -DUSE_OLD_IMAGE -DUSE_NON_CONST
+CC_OPTS = @CFLAGS@ -DUSE_OLD_IMAGE -DUSE_NON_CONST
 
 # To change the linker switches, for example to add -s,
 # change the following line:
@@ -189,7 +189,7 @@
 	find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \;
 	find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \;
 	@echo "=== Creating index..."
-	cd $(SCRIPT_INSTALL_DIR); $(BIN_INSTALL_DIR)/tkdesksh mkindex
+	cd $(SCRIPT_INSTALL_DIR); tclsh8.3 mkindex
 	@echo "=== Installing the manual pages..."
 	@for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \
 	    echo "installing $$f" ;\