#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# This program is meant for authors or maintainers which want to import
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2005-04-15 09:06:26 $'
+cvsdatestamp='$Date: 2005-05-14 06:03:57 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
--libtool Use libtool rules, for --import.
--no-changelog don't update or create ChangeLog files
--dry-run For --import, only print what would have been done.
- --symlink Make symbolic links instead of copying files.
+ -s, --symbolic, --symlink Make symbolic links instead of copying files.
Report bugs to <bug-gnulib@gnu.org>."
}
if test -L "$2" -a "$1" = "`readlink "$2"`"; then
:
else
- $dry rm "$2"
+ $dry rm -f "$2"
$dry ln -s "$1" "$2"
fi
}
lgpl=
do_changelog=:
dry_run=
- symlink=
+ symbolic=
lgpl=
supplied_opts="$@"
--dry-run )
dry_run=true
shift ;;
- --symlink )
- symlink=true
+ -s | --symbolic | --symlink )
+ symbolic=true
shift ;;
--help | --hel | --he | --h )
func_usage
# - libtool true if libtool will be used, blank otherwise
# - lgpl true if library's license shall be LGPL, blank otherwise
# - dry_run true if actions shall only be printed, blank otherwise
-# - symlink true if files should be symlinked, copied otherwise
+# - symbolic true if files should be symlinked, copied otherwise
# - supplied_opts all options passed to gnulib-tool
func_import ()
{
m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
*) g="$f" ;;
esac
- if test -z "$symlink"; then
+ if test -z "$symbolic"; then
func_cp_if_changed "$gnulib_dir/$f" "$destdir/$g"
else
func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
echo
echo "You may need to add #include directives for the following .h files."
for module in $modules; do
- func_get_include_directive "$module" | sed -e '/^$/d;' -e 's/^/ /'
- done
+ func_get_include_directive "$module"
+ done | LC_ALL=C sort -u | sed -e '/^$/d;' -e 's/^/ /'
echo
echo "Don't forget to add \"$sourcebase/Makefile\""
echo "to AC_CONFIG_FILES in \"$configure_ac\" and to mention"
*) g="$f" ;;
esac
ln "$gnulib_dir/$f" "$testdir/$g" 2>/dev/null ||
- if test -z "$symlink"; then
+ if test -z "$symbolic"; then
cp -p "$gnulib_dir/$f" "$testdir/$g"
else
ln -s "$gnulib_dir/$f" "$testdir/$g"