From 417342467141ce7249efd997c49e9ea5aa53139a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 15 Sep 2001 01:27:17 +0000 Subject: Don't copy the COPYING.* files into the enclosing package. --- intl/ChangeLog | 6 ++++-- intl/Makefile.in | 8 ++++---- misc/ChangeLog | 5 +++++ misc/gettextize.in | 18 ++++++++++-------- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index f6a4fdd..77277fc 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -23,13 +23,15 @@ (OBJECTS): Add plural-exp.$lo. Update dependencies. -2001-09-01 Bruno Haible +2001-09-13 Bruno Haible * *.h, *.c, *.y, Makefile.in: Change copyright notice from GPL to LGPL. This is a reaction to a blackmail from the GNOME project which threatened to distribute an LGPLed clone of libintl. * COPYING.LIB-2, COPYING.LIB-2.1: New files. - * Makefile.in (DISTFILES.common): Add them. + * Makefile.in (DISTFILES.gettext): Add them. + (install-data): Install them. + (uninstall): Uninstall them. 2001-07-28 Bruno Haible diff --git a/intl/Makefile.in b/intl/Makefile.in index 0dc41aa..52e466f 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -71,11 +71,11 @@ finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ plural.$lo plural-exp.$lo localcharset.$lo GETTOBJS = intl-compat.$lo -DISTFILES.common = COPYING.LIB-2 COPYING.LIB-2.1 Makefile.in \ +DISTFILES.common = Makefile.in \ config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = libintl.glibc +DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c # Libtool's library version information for libintl. @@ -185,7 +185,7 @@ install-data: all $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ - dists="$(DISTFILES.common)"; \ + dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \ for file in $$dists; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -244,7 +244,7 @@ uninstall: : ; \ fi if test "$(PACKAGE)" = "gettext"; then \ - for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \ + for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ diff --git a/misc/ChangeLog b/misc/ChangeLog index 2e1661c..254c8d4 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +2001-09-13 Bruno Haible + + * gettextize.in: Don't copy intl/COPYING*; these files may confuse + the user of the enclosing package. + 2001-08-23 Karl Eichwalder * po-mode.el (po-compute-counters): First save `current' diff --git a/misc/gettextize.in b/misc/gettextize.in index 8bc8940..081f8d4 100644 --- a/misc/gettextize.in +++ b/misc/gettextize.in @@ -159,14 +159,16 @@ done # Copy files to intl/ subdirectory. cd intl for file in *; do - rm -f $srcdir/intl/$file - if test $file != plural.c; then - ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file && $echo "Symlinking file intl/$file") 2>/dev/null || - { $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file; } - else - # plural.c is a generated file; it must be copied and touched. - $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file - sleep 2; touch $srcdir/intl/$file + if test $file != COPYING.LIB-2 && test $file != COPYING.LIB-2.1; then + rm -f $srcdir/intl/$file + if test $file != plural.c; then + ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file && $echo "Symlinking file intl/$file") 2>/dev/null || + { $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file; } + else + # plural.c is a generated file; it must be copied and touched. + $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file + sleep 2; touch $srcdir/intl/$file + fi fi done -- cgit v1.1