--- Makefile.in.orig	Mon Jan 15 08:51:22 1996
+++ Makefile.in	Sun Oct  4 16:13:35 1998
@@ -9,7 +9,7 @@
 
 # Current CTk version;  used in various names.
 
-VERSION = 4.0
+VERSION = @CTK_VERSION@
 
 #----------------------------------------------------------------
 # Things you can change to personalize the Makefile for your own
@@ -37,7 +37,7 @@
 # Directory from which applications will reference the library of Tcl
 # scripts (note: you can set the CTK_LIBRARY environment variable at
 # run-time to override the compiled-in location):
-CTK_LIBRARY =		$(prefix)/lib/ctk$(VERSION)
+CTK_LIBRARY =		$(prefix)/share/ctk$(VERSION)
 
 # Path name to use when installing library scripts:
 SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(CTK_LIBRARY)
@@ -64,11 +64,11 @@
 # appropriate version of Tcl for this version of CTk, curses,
 # and the math library (in that order).  It is (hopefully) filled
 # in properly by the configure script.
-LIBS = @LIBS@
+LIBS = @LIBS@ @DL_LIBS@ -ltcl75
 
 # To change the compiler switches, for example to change from -O
 # to -g, change the following line:
-CFLAGS = -O
+#CFLAGS = -O
 
 # Linker options (-L/.../lib) necessary to find the TCL
 # and curses libraries (if any).  It is (hopefully) filled in
@@ -121,6 +121,22 @@
 
 INSTALL = @srcdir@/install-sh -c
 
+# The symbols below provide support for dynamic loading and shared
+# libraries.  The values of the symbols are normally set by the
+# configure script.  You shouldn't normally need to modify any of
+# these definitions by hand.
+
+CTK_SHLIB_CFLAGS = @CTK_SHLIB_CFLAGS@
+
+CTK_LIB_FILE = @CTK_LIB_FILE@
+#TK_LIB_FILE = libtk.a
+
+# The symbol below provides support for dynamic loading and shared
+# libraries.  See configure.in for a description of what it means.
+# The values of the symbolis normally set by the configure script.
+
+SHLIB_LD = @SHLIB_LD@
+
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
 # Makefile is generated from Makefile.in.  You shouldn't normally
@@ -143,7 +159,9 @@
 CC =		@CC@
 CC_SWITCHES =	${CFLAGS} ${CPPFLAGS} -I${SRC_DIR} \
 ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
--DCTK_LIBRARY=\"${CTK_LIBRARY}\"
+-DCTK_LIBRARY=\"${CTK_LIBRARY}\" ${CTK_SHLIB_CFLAGS}
+
+WISH_OBJS = tkAppInit.o
 
 WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \
 	tkMenu.o tkMenubutton.o tkScrollbar.o
@@ -151,14 +169,14 @@
 TEXTOBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextIndex.o \
 	tkTextMark.o tkTextTag.o
 
-OBJS = ctkDisplay.o ctkRegion.o tkAppInit.o tkArgv.o tkBind.o tkCmds.o \
-	tkConfig.o tkEvent.o tkFocus.o tkFont.o tkGeometry.o tkGet.o \
+OBJS = ctkDisplay.o ctkRegion.o tkArgv.o tkBind.o tkCmds.o \
+	tkConfig.o tkFocus.o tkFont.o tkGeometry.o tkGet.o \
 	tkMain.o tkOption.o tkPack.o tkPlace.o tkPreserve.o tkUtil.o \
 	tkWindow.o tkXEvent.o \
 	$(WIDGOBJS) $(TEXTOBJS)
 
 SRCS = ctkDisplay.c ctkRegion.c tkAppInit.c tkArgv.c tkBind.c tkButton.c \
-	tkCmds.c tkConfig.c tkEntry.c tkEvent.c tkFocus.c tkFont.c tkFrame.c \
+	tkCmds.c tkConfig.c tkEntry.c tkFocus.c tkFont.c tkFrame.c \
 	tkGeometry.c tkGet.c tkListbox.c tkMain.c tkMenu.c tkMenubutton.c \
 	tkOption.c tkPack.c tkPlace.c tkPreserve.c tkScrollbar.c tkText.c \
 	tkTextBTree.c tkTextDisp.c tkTextIndex.c tkTextMark.c tkTextTag.c \
@@ -169,26 +187,28 @@
 
 DEMOPROGS = widget
 
-all: libctk.a cwish
-
-libctk.a: $(OBJS)
-	rm -f libctk.a
-	ar cr libctk.a $(OBJS)
-	$(RANLIB) libctk.a
+all: cwish
 
-cwish: tkAppInit.o libctk.a
-	$(CC) $(CC_SWITCHES) tkAppInit.o libctk.a $(LDFLAGS) $(LIBS) -o cwish
+@CTK_LIB_FILE@: ${OBJS}
+	rm -f @CTK_LIB_FILE@
+	@MAKE_LIB@
+	ln -sf @CTK_LIB_FILE@ libctk41.so
+	$(RANLIB) @CTK_LIB_FILE@
+
+cwish: $(WISH_OBJS) $(CTK_LIB_FILE)
+	$(CC) @LD_FLAGS@ $(WISH_OBJS) @CTK_BUILD_LIB_SPEC@ $(LDFLAGS) $(LIBS) \
+		@CTK_LD_SEARCH_FLAGS@ -o cwish
 
 configInfo: Makefile
 	@rm -f configInfo
 	@echo "# Definitions and libraries needed to build Tk applications" >> configInfo
 	@echo "# (generated by the configure script):" >> configInfo
-	@echo "TK_CC_SWITCHES = ${AC_FLAGS} ${MEM_DEBUG_FLAGS}" >> configInfo
-	@echo "TK_LIBS = @LIBS@" >> configInfo
+	@echo "CTK_CC_SWITCHES = ${AC_FLAGS} ${MEM_DEBUG_FLAGS}" >> configInfo
+	@echo "CTK_LIBS = @LIBS@" >> configInfo
 
 install: install-binaries install-libraries install-demos install-man
 
-install-binaries: libctk.a cwish
+install-binaries: $(CTK_LIB_FILE) cwish
 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
@@ -198,9 +218,11 @@
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing libctk.a"
-	@$(INSTALL_DATA) libctk.a $(LIB_INSTALL_DIR)
-	@$(RANLIB) $(LIB_INSTALL_DIR)/libctk.a
+	@echo "Installing $(CTK_LIB_FILE)"
+	@$(INSTALL_DATA) $(CTK_LIB_FILE) $(LIB_INSTALL_DIR)/$(CTK_LIB_FILE)
+	@ln -sf $(CTK_LIB_FILE) $(LIB_INSTALL_DIR)/libctk41.so
+	@$(RANLIB) $(LIB_INSTALL_DIR)/$(CTK_LIB_FILE)
+	@chmod 555 $(LIB_INSTALL_DIR)/$(CTK_LIB_FILE)
 	@echo "Installing cwish"
 	@$(INSTALL_PROGRAM) cwish $(BIN_INSTALL_DIR)
 
@@ -217,6 +239,8 @@
 	    done;
 	@echo "Installing ctk.h"
 	@$(INSTALL_DATA) $(SRC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/ctk.h
+	@echo "Installing ctkConfig.sh"
+	@$(INSTALL_DATA) ctkConfig.sh $(LIB_INSTALL_DIR)/ctkConfig.sh
 	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex; \
 	    do \
 	    echo "Installing $$i"; \
