2000-06-22 Syd Polk <spolk@redhat.com>

	* itcl/win/Makefile.in: Added target install-shared-libraries.
	Make install-binaries and install-libraries both install it.
	* itk/win/Makefile.in: Likewise.

	* iwidgets3.0.0/unix/Makefile.in: Add dummy target
	install-binaries.

2000-06-19  Syd Polk  <spolk@redhat.com>

	* itcl/win/Makefile.in: Install ITCLLIB instead of CYGITCLLIB
	when installing the finished binaries.

diff --git a/itcl/ChangeLog b/itcl/ChangeLog
index 918b05f..eb4e132 100644 (file)
--- a/itcl/ChangeLog
+++ b/itcl/ChangeLog
@@ -1,3 +1,17 @@
+2000-06-22  Syd Polk  <spolk@redhat.com>
+
+       * itcl/win/Makefile.in: Added target install-shared-libraries.
+       Make install-binaries and install-libraries both install it.
+       * itk/win/Makefile.in: Likewise.
+
+       * iwidgets3.0.0/unix/Makefile.in: Add dummy target 
+       install-binaries.
+       
+2000-06-19  Syd Polk  <spolk@redhat.com>
+
+       * itcl/win/Makefile.in: Install ITCLLIB instead of CYGITCLLIB
+       when installing the finished binaries.
+
 2000-06-15  Jonathan Larmour  <jlarmour@redhat.co.uk>
 
        * iwidgets3.0.0/unix/configure.in: Use config scripts from build

diff --git a/itcl/itcl/win/Makefile.in b/itcl/itcl/win/Makefile.in
index 61938ee..7b5c18f 100644 (file)
--- a/itcl/itcl/win/Makefile.in
+++ b/itcl/itcl/win/Makefile.in
@@ -224,7 +224,7 @@ $(CYGITCLTEST): $(ITCLTESTOBJS) $(CYGITCLLIB) $(TMPDIR)/$(CYGITCLSHRES)
        $(CC) $(linkdebug) $(conlflags) -Wl,--stack=0x2300000 \
                $(ITCL_CFLAGS) \
                $(ITCLTESTOBJS) $(TMPDIR)/$(CYGITCLSHRES) \
-               $(CYGITCLLIB) $(TCLLIBDIR)/$(TCLLIB) $(conlibsdll) \ 
+               $(CYGITCLLIB) $(TCLLIBDIR)/$(TCLLIB) $(conlibsdll) \
                -o $(CYGITCLTEST)
 
 $(TMPDIR)/$(CYGITCLSHRES):: $(ROOT)/win/itclsh.rc
@@ -311,7 +311,7 @@ config.status: $(srcdir)/configure
 install:: install-basic install-binaries
        @echo done
 
-install-binaries::
+install-binaries:: install-shared-libraries
        @for i in $(INSTALL_LIB_DIR) $(INSTALL_BIN_DIR) ; \
            do \
            if [ ! -d $$i ] ; then \
@@ -321,12 +321,10 @@ install-binaries::
                else true; \
                fi; \
            done;
-       @echo "Installing $(CYGITCLLIB) as $(INSTALL_LIB_DIR)/$(CYGITCLLIB)"
-       @$(INSTALL_DATA) $(CYGITCLLIB) $(INSTALL_LIB_DIR)/$(CYGITCLLIB)
-       @echo "Installing $(CYGITCLSH) as $(INSTALL_BIN_DIR)/$(CYGITCLSH)"
-       @$(INSTALL_PROGRAM) $(CYGITCLSH) $(INSTALL_BIN_DIR)/$(CYGITCLSH)
-       @echo "Installing $(CYGITCLDLL) as $(INSTALL_BIN_DIR)/$(CYGITCLDLL)"
-       @$(INSTALL_PROGRAM) $(CYGITCLDLL) $(INSTALL_BIN_DIR)/$(CYGITCLDLL)
+       @echo "Installing $(ITCLLIB) as $(INSTALL_LIB_DIR)/$(ITCLLIB)"
+       @$(INSTALL_DATA) $(ITCLLIB) $(INSTALL_LIB_DIR)/$(ITCLLIB)
+       @echo "Installing $(ITCLSH) as $(INSTALL_BIN_DIR)/$(ITCLSH)"
+       @$(INSTALL_PROGRAM) $(ITCLSH) $(INSTALL_BIN_DIR)/$(ITCLSH)
 
 #
 # Basic installtion
@@ -351,7 +349,7 @@ install-headers:
            $(INSTALL_DATA) $$i $(INSTALL_INCLUDE_DIR); \
            done;
 
-install-libraries:
+install-libraries: install-shared-libraries
        @for i in $(prefix)/lib $(ITCL_LIBRARY); \
            do \
            if [ ! -d $$i ] ; then \
@@ -365,6 +363,9 @@ install-libraries:
        @$(INSTALL_DATA) $(srcdir)/pkgIndex.tcl $(ITCL_LIBRARY)
        @$(INSTALL_DATA) $(srcdir)/../library/itcl.tcl $(ITCL_LIBRARY)
 
+install-shared-libraries:
+       @echo "Installing $(ITCLDLL) as $(INSTALL_BIN_DIR)/$(ITCLDLL)"
+       @$(INSTALL_PROGRAM) $(ITCLDLL) $(INSTALL_BIN_DIR)/$(ITCLDLL)
 
 install-man:
        @for i in $(INSTALL_MAN_DIR) $(INSTALL_MAN1_DIR) \

diff --git a/itcl/iwidgets3.0.0/unix/Makefile.in b/itcl/iwidgets3.0.0/unix/Makefile.in
index 2404d16..fab7ce5 100644 (file)
--- a/itcl/iwidgets3.0.0/unix/Makefile.in
+++ b/itcl/iwidgets3.0.0/unix/Makefile.in
@@ -82,25 +82,25 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/doc
 TCL_LIB_DIR = @TCL_LIB_DIR@
 
 # Directory containing Tcl source code (for library used during test):
-TCL_SRC_DIR = ${srcdir}/../../../../tcl
+TCL_SRC_DIR = @TCL_SRC_DIR@
 
 # Tk libraries can be found here:
 TK_LIB_DIR = @TK_LIB_DIR@
 
 # Directory containing Tk source code (for library used during test):
-TK_SRC_DIR = ${srcdir}/../../../tk
+TK_SRC_DIR = @TK_SRC_DIR@
 
 # Itcl libraries can be found here:
 ITCL_LIB_DIR = @ITCL_LIB_DIR@
 
 # Directory containing Itcl source code (for library used during test):
-ITCL_SRC_DIR = ${srcdir}/../../itcl
+ITCL_SRC_DIR = @ITCL_SRC_DIR@
 
 # Itk libraries can be found here:
 ITK_LIB_DIR = @ITK_LIB_DIR@
 
 # Directory containing Itk source code (for library used during test):
-ITK_SRC_DIR = ${srcdir}/../../itk
+ITK_SRC_DIR = @ITK_SRC_DIR@
 
 # [incr Tk] build directory containing the itkwish binary for 'make test'
 ITK_BIN_DIR = ../../itk/unix
@@ -156,7 +156,9 @@ standalone:
 
 plusplus:
 
-install: install-libraries install-demos install-man
+install: install-libraries install-demos install-man install-binaries
+
+install-binaries:
 
 install-libraries:
        @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)

diff --git a/itcl/iwidgets3.0.0/unix/configure b/itcl/iwidgets3.0.0/unix/configure
index 9c79316..b0a4750 100755 (executable)
--- a/itcl/iwidgets3.0.0/unix/configure
+++ b/itcl/iwidgets3.0.0/unix/configure
@@ -37,6 +37,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -151,6 +152,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -321,6 +323,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -486,12 +493,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -568,7 +579,7 @@ echo $ac_n "checking for prefix by $ac_c" 1>&6
 # Extract the first word of "tclsh", so it can be a program name with args.
 set dummy tclsh; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:572: checking for $ac_word" >&5
+echo "configure:583: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -625,7 +636,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:629: checking for a BSD compatible install" >&5
+echo "configure:640: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -680,7 +691,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:684: checking for $ac_word" >&5
+echo "configure:695: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else