This is the mail archive of the insight@sources.redhat.com mailing list for the Insight project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: INSTALL_DATA, ranlib, and tcl-related shared libraries


I approve these changes. Fernando or Keith, can you check them in?

At 06:17 PM 4/17/01 -0400, Phil Edwards wrote:
>[please cc replies to my address also]
>
>For a few months now I've been having to work around the same problem as
>this guy did a year ago:
>http://sources.redhat.com/ml/insight/1999-q3/msg00085.html
>
>I submitted a patch (mistakenly to the gdb list), which was forwarded on
>to the Insight list:
>http://sources.redhat.com/ml/gdb/2001-01/msg00023.html
>
>If Insight isn't going to be ported to Libtool anytime soon, could someone
>consider applying this?  An updated patch is appended.  In my previous email
>I said that this wasn't suitable for applying directly, but it works in
>"most cases," and it's better than completely dying...
>
>
>It contains an additional thinko fix; tixwish is mistakenly installed with
>INSTALL_DATA, not INSTALL_PROGRAM, which means that its permissions lack
>the execute bit.  That fix should be done, at least.
>
>
>Phil
>
>
>Index: itcl/itcl/unix/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/itcl/itcl/unix/Makefile.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -r1.1.1.1 Makefile.in
>*** Makefile.in 2000/02/07 00:19:46     1.1.1.1
>--- Makefile.in 2001/04/17 01:00:36
>***************
>*** 193,199 ****
>   @ITCL_LIB_FILE@:  $(OBJS)
>         rm -f $(ITCL_LIB_FILE)
>         @MAKE_LIB@
>!       $(RANLIB) $(ITCL_LIB_FILE)
>
>   itclsh: tclAppInit.o $(ITCL_LIB_FILE) @TCL_LIB_FULL_PATH@
>         $(CC) @LD_FLAGS@ tclAppInit.o @ITCL_BUILD_LIB_SPEC@ \
>--- 193,199 ----
>   @ITCL_LIB_FILE@:  $(OBJS)
>         rm -f $(ITCL_LIB_FILE)
>         @MAKE_LIB@
>!       case $(ITCL_LIB_FILE) in *.a) $(RANLIB) $(ITCL_LIB_FILE) ;; esac
>
>   itclsh: tclAppInit.o $(ITCL_LIB_FILE) @TCL_LIB_FULL_PATH@
>         $(CC) @LD_FLAGS@ tclAppInit.o @ITCL_BUILD_LIB_SPEC@ \
>***************
>*** 213,219 ****
>         @$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
>         @echo "Installing $(ITCL_LIB_FILE)"
>         @$(INSTALL_DATA) $(ITCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE)
>!       @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITCL_LIB_FILE))
>         chmod 555 $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE)
>         @echo "Installing itclsh"
>         $(INSTALL_PROGRAM) itclsh $(BIN_INSTALL_DIR)/itclsh$(VERSION)
>--- 213,219 ----
>         @$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
>         @echo "Installing $(ITCL_LIB_FILE)"
>         @$(INSTALL_DATA) $(ITCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE)
>!       @case $(ITCL_LIB_FILE) in *.a) (cd $(LIB_INSTALL_DIR); $(RANLIB) 
>$(ITCL_LIB_FILE));; esac
>         chmod 555 $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE)
>         @echo "Installing itclsh"
>         $(INSTALL_PROGRAM) itclsh $(BIN_INSTALL_DIR)/itclsh$(VERSION)
>Index: itcl/itk/unix/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/itcl/itk/unix/Makefile.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -r1.1.1.1 Makefile.in
>*** Makefile.in 2000/02/07 00:19:46     1.1.1.1
>--- Makefile.in 2001/04/17 01:00:36
>***************
>*** 226,232 ****
>   @ITK_LIB_FILE@: ${OBJS}
>         rm -f $(ITK_LIB_FILE)
>         @MAKE_LIB@
>!       $(RANLIB) $(ITK_LIB_FILE)
>
>   itkwish: tkAppInit.o $(ITK_LIB_FILE) @TCL_LIB_FULL_PATH@ 
> @TK_LIB_FULL_PATH@ \
>                 @ITCL_LIB_FULL_PATH@
>--- 226,232 ----
>   @ITK_LIB_FILE@: ${OBJS}
>         rm -f $(ITK_LIB_FILE)
>         @MAKE_LIB@
>!       case $(ITK_LIB_FILE) in *.a) $(RANLIB) $(ITK_LIB_FILE) ;; esac
>
>   itkwish: tkAppInit.o $(ITK_LIB_FILE) @TCL_LIB_FULL_PATH@ 
> @TK_LIB_FULL_PATH@ \
>                 @ITCL_LIB_FULL_PATH@
>***************
>*** 253,259 ****
>         @$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
>         @echo "Installing $(ITK_LIB_FILE)"
>         @$(INSTALL_DATA) $(ITK_LIB_FILE) $(LIB_INSTALL_DIR)
>!       @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITK_LIB_FILE))
>         @chmod 555 $(LIB_INSTALL_DIR)/$(ITK_LIB_FILE)
>         @echo "Installing itkwish"
>         $(INSTALL_PROGRAM) itkwish $(BIN_INSTALL_DIR)/itkwish$(VERSION)
>--- 253,259 ----
>         @$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
>         @echo "Installing $(ITK_LIB_FILE)"
>         @$(INSTALL_DATA) $(ITK_LIB_FILE) $(LIB_INSTALL_DIR)
>!       @case $(ITK_LIB_FILE) in *.a) (cd $(LIB_INSTALL_DIR); $(RANLIB) 
>$(ITK_LIB_FILE));; esac
>         @chmod 555 $(LIB_INSTALL_DIR)/$(ITK_LIB_FILE)
>         @echo "Installing itkwish"
>         $(INSTALL_PROGRAM) itkwish $(BIN_INSTALL_DIR)/itkwish$(VERSION)
>Index: tcl/unix/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/tcl/unix/Makefile.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -r1.1.1.1 Makefile.in
>*** Makefile.in 1999/11/09 01:28:44     1.1.1.1
>--- Makefile.in 2001/04/17 01:00:36
>***************
>*** 449,455 ****
>             done;
>         @echo "Installing $(TCL_LIB_FILE)"
>         @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
>!       @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
>         @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
>         @echo "Installing tclsh"
>         @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh
>--- 449,455 ----
>             done;
>         @echo "Installing $(TCL_LIB_FILE)"
>         @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
>!       @case $(TCL_LIB_FILE) in *.a) (cd $(LIB_INSTALL_DIR); $(RANLIB) 
>$(TCL_LIB_FILE));; esac
>         @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
>         @echo "Installing tclsh"
>         @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh
>Index: tix/unix/tk8.0/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/tix/unix/tk8.0/Makefile.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -r1.1.1.1 Makefile.in
>*** Makefile.in 2000/02/07 00:19:29     1.1.1.1
>--- Makefile.in 2001/04/17 01:00:36
>***************
>*** 67,73 ****
>   #
>   TCL_SRC_DIR     = @TCL_SRC_DIR@
>   TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic
>! TCL_BIN_DIR   = @TCL_BIN_DIR@
>
>   # Location of the Tk 8.0 source directory.
>   #
>--- 67,73 ----
>   #
>   TCL_SRC_DIR     = @TCL_SRC_DIR@
>   TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic
>! TCL_BIN_DIR=@TCLBINDIR_VARIABLE@
>
>   # Location of the Tk 8.0 source directory.
>   #
>***************
>*** 84,89 ****
>--- 84,90 ----
>
>   RUN_TCLSH     = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
>                   TK_LIBRARY=$(TK_SRC_DIR)/library \
>+                 LD_LIBRARY_PATH=$(TCL_BIN_DIR):${LD_LIBRARY_PATH} \
>                   $(TCL_BIN_DIR)/tclsh
>
>
>***************
>*** 483,489 ****
>         @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)"
>         @$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
>         @echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)"
>!       @$(INSTALL_DATA) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE)
>
>   _install_sam_exe_: $(SAM_TARGETS)
>         @for i in $(LIB_DIR) $(BIN_DIR) ; \
>--- 484,490 ----
>         @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)"
>         @$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
>         @echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)"
>!       @$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE)
>
>   _install_sam_exe_: $(SAM_TARGETS)
>         @for i in $(LIB_DIR) $(BIN_DIR) ; \
>Index: tix/unix/tk8.0/configure.in
>===================================================================
>RCS file: /cvs/src/src/tix/unix/tk8.0/configure.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -r1.1.1.1 configure.in
>*** configure.in        2000/02/07 00:19:29     1.1.1.1
>--- configure.in        2001/04/17 01:00:36
>***************
>*** 144,150 ****
>
>   # CYGNUS LOCAL: This used to get TCL_BIN_DIR from TCL_SRC_DIR, which
>   # only works when srcdir == objdir
>! TCL_BIN_DIR=../../../tcl/unix
>
>   #--------------------------------------------------------------------
>   #     See if there was a command-line option for where Tk is;  if
>--- 144,150 ----
>
>   # CYGNUS LOCAL: This used to get TCL_BIN_DIR from TCL_SRC_DIR, which
>   # only works when srcdir == objdir
>! TCLBINDIR_VARIABLE=../../../tcl/unix
>
>   #--------------------------------------------------------------------
>   #     See if there was a command-line option for where Tk is;  if
>***************
>*** 221,227 ****
>   #     Makefile.
>   #--------------------------------------------------------------------
>
>! file=$TCL_BIN_DIR/tclConfig.sh
>   . $file
>   CC=$TCL_CC
>   SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
>--- 221,227 ----
>   #     Makefile.
>   #--------------------------------------------------------------------
>
>! file=$TCLBINDIR_VARIABLE/tclConfig.sh
>   . $file
>   CC=$TCL_CC
>   SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
>***************
>*** 387,393 ****
>   AC_SUBST(TCL_LIBS)
>   AC_SUBST(TCL_VERSION)
>   AC_SUBST(TCL_SRC_DIR)
>! AC_SUBST(TCL_BIN_DIR)
>   AC_SUBST(TCL_LIB_FULL_PATH)
>   AC_SUBST(TK_BUILD_LIB_SPEC)
>   AC_SUBST(TK_LIBS)
>--- 387,393 ----
>   AC_SUBST(TCL_LIBS)
>   AC_SUBST(TCL_VERSION)
>   AC_SUBST(TCL_SRC_DIR)
>! AC_SUBST(TCLBINDIR_VARIABLE)
>   AC_SUBST(TCL_LIB_FULL_PATH)
>   AC_SUBST(TK_BUILD_LIB_SPEC)
>   AC_SUBST(TK_LIBS)
>Index: tk/unix/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/tk/unix/Makefile.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -r1.1.1.1 Makefile.in
>*** Makefile.in 2000/02/07 00:19:30     1.1.1.1
>--- Makefile.in 2001/04/17 01:00:36
>***************
>*** 386,392 ****
>             done;
>         @echo "Installing $(TK_LIB_FILE)"
>         @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
>!       @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
>         @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
>         @echo "Installing wish"
>         @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish
>--- 386,392 ----
>             done;
>         @echo "Installing $(TK_LIB_FILE)"
>         @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
>!       @case $(TK_LIB_FILE) in *.a) (cd $(LIB_INSTALL_DIR); $(RANLIB) 
>$(TK_LIB_FILE));; esac
>         @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
>         @echo "Installing wish"
>         @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish

Syd Polk		spolk@redhat.com
Engineering Manager	+1 408 543 9430
Red Hat, Inc.




Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]