@@ -7,11 +7,11 @@
 #
 # @(#) $Id: ctk.shar,v 1.50 1996/01/15 14:47:16 andrewm Exp andrewm $
 
 # Current CTk version;  used in various names.
 
-VERSION = 8.0
+VERSION = @PACKAGE_VERSION@
 
 #----------------------------------------------------------------
 # Things you can change to personalize the Makefile for your own
 # site (you can make these changes in either Makefile.in or
 # Makefile, but changes to Makefile will get lost if you re-run
@@ -181,32 +181,26 @@
 
 libctk.@SHOBJEXT@: $(OBJS)
 	rm -f libctk.@SHOBJEXT@
 	$(CC) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o libctk.@SHOBJEXT@ $(OBJS) $(LIBS)
 
-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
-
 install: install-binaries install-libraries install-demos install-man
 
-install-binaries: libctk.a
+install-binaries: @TARGETS@
 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
 		mkdir $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing libctk.a"
-	@$(INSTALL_DATA) libctk.a $(LIB_INSTALL_DIR)
-	@$(RANLIB) $(LIB_INSTALL_DIR)/libctk.a
+	@for target in @TARGETS@; do
+		echo "Installing $${target}"; \
+		$(INSTALL_DATA) $${target} $(LIB_INSTALL_DIR); \
+	done
 
 install-libraries:
 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 		$(SCRIPT_INSTALL_DIR) ; \
 	    do \
@@ -267,11 +261,11 @@
 
 Makefile: $(SRC_DIR)/Makefile.in
 	$(SHELL) config.status
 
 clean:
-	rm -f libctk.a libctk.so
+	rm -f libctk.a libctk.@SHOBJEXT@
 	rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors tktest cwish$(VERSION) \
 		config.info
 
 distclean: clean
 	rm -f Makefile config.status config.log pkgIndex.tcl
@@ -280,52 +274,6 @@
 	makedepend -- $(CC_SWITCHES) -- $(SRCS)
 
 .c.o:
 	$(CC) -c $(CC_SWITCHES) $<
 
-#
-# Target to check for proper usage of UCHAR macro.
-#
-
-checkuchar:
-	-egrep isalnum\|isalpha\|iscntrl\|isdigit\|islower\|isprint\|ispunct\|isspace\|isupper\|isxdigit $(SRCS) | grep -v UCHAR
-
-#
-# Target to make sure that only symbols with "Tk" or "Ctk" prefixes are
-# exported.
-#
-
-checkexports: libctk.a
-	-nm -p libctk.a | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Cc]?[Tt]k'
-
-#
-# Target to create a proper Tk distribution from information in the
-# master source directory.  DISTDIR must be defined to indicate where
-# to put the distribution.
-#
-
-configure: configure.in
-	autoconf
-dist:   configure
-	rm -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	cp license.terms Makefile.in $(DISTDIR)
-	chmod 664 $(DISTDIR)/Makefile.in
-	cp -p $(SRCS) $(HDRS) $(DISTDIR)
-	mkdir $(DISTDIR)/compat
-	cp -p license.terms compat/unistd.h compat/stdlib.h $(DISTDIR)/compat
-	cp -p README README.TERM ToDo changes porting.notes *.1 $(DISTDIR)
-	cp -p configure configure.in install-sh $(DISTDIR)
-	chmod 775 $(DISTDIR)/configure $(DISTDIR)/configure.in
-	chmod +x $(DISTDIR)/install-sh
-	mkdir $(DISTDIR)/library
-	cp -p license.terms library/*.tcl library/tclIndex $(DISTDIR)/library
-	mkdir $(DISTDIR)/library/demos
-	cp -pr library/demos/widget library/demos/README \
-		license.terms $(DISTDIR)/library/demos
-
-mci_args:
-	@echo ctk README README.TERM ToDo changes porting.notes license.terms \
-		Makefile.in configure.in install-sh \
-		$(SRCS) $(HDRS) compat library
-		
 # DO NOT DELETE THIS LINE -- make depend depends on it.