From fa556d00ed941cbcffebc6ac4c8656cffc56c34d Mon Sep 17 00:00:00 2001 From: mkoch Date: Tue, 16 Dec 2003 21:48:25 +0000 Subject: 2003-12-16 Michael Koch Fix for PR libgcj/13056. * libltdl/configure.in, libltdl/config.h.in: Removed. * libltdl/configure.ac, libltdl/config-h.in, libltdl/install-sh, libltdl/config.guess, libltdl/config.sub, libltdl/missing, libltdl/mkinstalldirs, libltdl/ltmain.sh: New files. * libltdl/Makefile.am, libltdl/acinclude.m4, libltdl/aclocal.m4, libltdl/ltdl.c, libltdl/ltdl.h, libltdl/README: Update to versions from libtool 1.5. libltdl/configure, * libltdl/Makefile.in: Regenerated. * java/lang/natRuntime.cc (find_symbol): Use type 'lt_ptr' instead of 'lt_ptr_t'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74711 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/libltdl/install-sh | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) (limited to 'libjava/libltdl/install-sh') diff --git a/libjava/libltdl/install-sh b/libjava/libltdl/install-sh index 36f96f3e033..6ce63b9f76b 100755 --- a/libjava/libltdl/install-sh +++ b/libjava/libltdl/install-sh @@ -1,19 +1,37 @@ #!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). # -# Copyright 1991 by the Massachusetts Institute of Technology +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -221,8 +239,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ # Trap to clean up temp files at exit. -- cgit v1.2.3