[yap] Fix info pages installation

Petr Pisar ppisar at fedoraproject.org
Tue Jan 4 10:45:14 UTC 2011


commit d963c2ceafe3c72cb1cd0f3a32c5dd0f445d655b
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Dec 21 11:09:38 2010 +0100

    Fix info pages installation

 yap-6.2.0-Install-directory-for-info-pages.patch |   24 ++++++++++++++++++++++
 yap.spec                                         |   10 +++++---
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/yap-6.2.0-Install-directory-for-info-pages.patch b/yap-6.2.0-Install-directory-for-info-pages.patch
new file mode 100644
index 0000000..cbe8fb5
--- /dev/null
+++ b/yap-6.2.0-Install-directory-for-info-pages.patch
@@ -0,0 +1,24 @@
+From d6ce7191c9dcac1681a2b29d68db0858133405c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 21 Dec 2010 11:31:37 +0100
+Subject: [PATCH] Install directory for info pages
+
+---
+ Makefile.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5fbf662..522ac0a 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -711,6 +711,7 @@ yap.dll:  libYap.a
+ 
+ install_info:
+ 	$(MAKE) info; \
++	mkdir -p $(DESTDIR)$(INFODIR); \
+ 	$(INSTALL) yap.info* $(DESTDIR)$(INFODIR); \
+ 	if test -e $(DESTDIR)$(INFODIR)/emacs.bz2; then \
+ 	  bzip2 --quiet --force $(DESTDIR)$(INFODIR)/yap.info*; \
+-- 
+1.7.3.4
+
diff --git a/yap.spec b/yap.spec
index 0cf8918..804c897 100644
--- a/yap.spec
+++ b/yap.spec
@@ -12,6 +12,7 @@ Source3:    chr_translate_bootstrap2.pl
 Source4:    chr_translate.pl
 Patch1:     Yap-noni386.patch
 Patch2:     yap-6.2.0-Locate-mysql-by-mysql_config.patch
+Patch3:     yap-6.2.0-Install-directory-for-info-pages.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, gmp-devel, texinfo
 BuildRequires:  autoconf
@@ -49,7 +50,9 @@ Documentation for Yap.
 %setup -q -n %{name}-6
 %patch1 -p1
 %patch2 -p1 -b .mysql_config
+%patch3 -p1 -b .install_info_directory
 # Regerenate configure because of yap-6.2.0-Locate-mysql-by-mysql_config.patch
+# and yap-6.2.0-Install-directory-for-info-pages.patch
 autoconf
 
 find -name CVS -print0 | xargs -0 rm -rf
@@ -102,15 +105,13 @@ done
     --enable-depth-limit \
         --enable-dynamic-loading
 make %{?_smp_mflags}
-make -C docs info
+make %{?_smp_mflags} info
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT%{_infodir}
-cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir}
-cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir}
+make DESTDIR=$RPM_BUILD_ROOT install_info
 
 # fix permissions and flags
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/*
@@ -176,6 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 - Remove uneeded Yap-creat.patch
 - Remove uneeded Yap-5.1.1-config.sub.patch
 - Locate mysql by mysql_config
+- Fix info pages installation
 
 * Wed Dec 08 2010 Petr Pisar <ppisar at redhat.com> - 5.1.3-3
 - Hack SWI-compatible libraries build system to be compilable (bug #660965)


More information about the scm-commits mailing list