Don't copy the COPYING.* files into the enclosing package.

This commit is contained in:
Bruno Haible 2001-09-15 01:27:32 +00:00
parent e9fb53c5dc
commit 02fc4a6b7e
4 changed files with 31 additions and 14 deletions

View File

@ -1,14 +1,20 @@
2001-09-13 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.40 released.
2001-07-11 Ulrich Drepper <drepper@redhat.com>
* locale.alias: Use he language code for hebrew, not iw.
2001-09-01 Bruno Haible <haible@clisp.cons.org>
2001-09-13 Bruno Haible <haible@clisp.cons.org>
* *.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-24 Bruno Haible <haible@clisp.cons.org>

View File

@ -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 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 \

View File

@ -1,3 +1,12 @@
2001-09-13 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.40 released.
2001-09-13 Bruno Haible <haible@clisp.cons.org>
* gettextize.in: Don't copy intl/COPYING*; these files may confuse
the user of the enclosing package.
2001-07-24 Bruno Haible <haible@clisp.cons.org>
* gettext-0.10.39 released.

View File

@ -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