projects / packages / texi2html.git / blame
| Commit | Line | Data |
|---|---|---|
| d307112c MK |
1 | From 68e345ada811cdea2d9ccf056001e15f6e2316a0 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> | |
| 3 | Date: Wed, 22 Oct 2014 10:30:16 +0200 | |
| 4 | Subject: [PATCH] Do not install libintl-perl if external is used | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | Configuration --with-external-libintl-perl=yes should not | |
| 10 | install the bundled libintl-perl code. This patch fixes it. | |
| 11 | ||
| 12 | Signed-off-by: Petr Písař <ppisar@redhat.com> | |
| 13 | --- | |
| 14 | Makefile.am | 18 ++++++++++-------- | |
| 15 | 1 file changed, 10 insertions(+), 8 deletions(-) | |
| 16 | ||
| 17 | diff --git a/Makefile.am b/Makefile.am | |
| 18 | index bc3257b..37dfd0f 100644 | |
| 19 | --- a/Makefile.am | |
| 20 | +++ b/Makefile.am | |
| 21 | @@ -259,14 +259,16 @@ distclean-local: | |
| 22 | install-data-local: i18n | |
| 23 | $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/i18n | |
| 24 | $(INSTALL_DATA) i18n/*.thl $(DESTDIR)$(pkgdatadir)/i18n | |
| 25 | - $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \ | |
| 26 | - $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData | |
| 27 | - $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \ | |
| 28 | - $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale | |
| 29 | - $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \ | |
| 30 | - $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode | |
| 31 | - $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \ | |
| 32 | - $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData | |
| 33 | + if test '$(USE_EXTERNAL_LIBINTL)' != 'yes'; then \ | |
| 34 | + $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \ | |
| 35 | + $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData ;\ | |
| 36 | + $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \ | |
| 37 | + $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale ; \ | |
| 38 | + $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \ | |
| 39 | + $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode ; \ | |
| 40 | + $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \ | |
| 41 | + $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData ; \ | |
| 42 | + fi | |
| 43 | if test '$(USE_EXTERNAL_EASTASIANWIDTH)' != 'yes'; then \ | |
| 44 | $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode ; \ | |
| 45 | $(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \ | |
| 46 | -- | |
| 47 | 1.9.3 | |
| 48 |