[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [bug-gettext] 0.18.2: install fails, missing COPYING.LIB-*
From: |
Daiki Ueno |
Subject: |
Re: [bug-gettext] 0.18.2: install fails, missing COPYING.LIB-* |
Date: |
Mon, 21 Jan 2013 11:52:56 +0900 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
Hi,
Christian Weisgerber <address@hidden> writes:
> I'm trying to build gettext 0.18.2 on OpenBSD/amd64 and it fails
> at the install stage:
>
> install: ../../gettext-runtime/intl/COPYING.LIB-2.0: No such file or directory
>
> This happens out of gettext-tools/intl/Makefile (generated from
> gettext-runtime/intl/Makefile.in I think), where the install-data
> target wants to install COPYING.LIB-2.0 and COPYING.LIB-2.1, but
> only COPYING.LIB exists.
Thanks for the report. I'm going to apply the attached patch.
I don't think this makes the whole "make install" step fail, or does it?
Regards,
--
Daiki Ueno
>From c1ca62c334121dad1d50f924545a6c99eb1ada6d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <address@hidden>
Date: Mon, 21 Jan 2013 11:09:24 +0900
Subject: [PATCH] Remove references to non-existing COPYING.LIB-2.*.
---
gettext-runtime/intl/ChangeLog | 10 ++++++++++
gettext-runtime/intl/Makefile.in | 7 ++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 0fa70d9..c3786a7 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-21 Daiki Ueno <address@hidden>
+
+ Remove references to non-existing COPYING.LIB-2.*.
+ Reported by Christian Weisgerber <address@hidden>.
+ * Makefile.in (DISTFILES.obsolete): Add COPYING.LIB-2.*.
+ (install-data): Install COPYING.LIB instead of no longer existing
+ COPYING.LIB-2.*.
+ (uninstall): Remove COPYING.LIB instead of no longer existing
+ COPYING.LIB-2.*.
+
2013-01-17 Daiki Ueno <address@hidden>
Fix link errors related to C99-style extern inline.
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 449fdb1..0f3f46c 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -203,7 +203,8 @@ DISTFILES.generated = plural.c
DISTFILES.normal = VERSION
DISTFILES.gettext = COPYING.LIB libintl.glibc README.woe32
DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
+COPYING.LIB-2 COPYING.LIB-2.0 COPYING.LIB-2.1 \
+gettext.h libgettext.h plural-eval.c libgnuintl.h \
libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
libgnuintl.h.msvc-shared Makefile.msvc
@@ -460,7 +461,7 @@ install-data: all
$(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
$(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
$(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
- dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
+ dists="COPYING.LIB $(DISTFILES.common)"; \
for file in $$dists; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -570,7 +571,7 @@ uninstall:
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools"; then \
- for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1
$(DISTFILES.common) $(DISTFILES.generated); do \
+ for file in VERSION ChangeLog COPYING.LIB $(DISTFILES.common)
$(DISTFILES.generated); do \
rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
done; \
else \
--
1.8.1