another try to fix info file handling

3 files changed, 15 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c86fa082a5c2..d74c12617977 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = guile-git
 	pkgdesc = A portable, embeddable Scheme implementation (Git snapshot)
-	pkgver = 3.0.5.r140.g01bfd18f3
+	pkgver = 3.0.5.r141.g88e703084
 	pkgrel = 1
 	epoch = 1
 	url = http://www.gnu.org/software/guile/
@@ -22,9 +22,7 @@ pkgbase = guile-git
 	options = !makeflags
 	options = libtool
 	source = git+https://git.savannah.gnu.org/git/guile.git
-	source = rename_infofile.diff
 	sha256sums = SKIP
-	sha256sums = b2674297c0b4ceba1f94616f04a1bf3ae5586cc27433978a5e7e35b71e2ad53f
 
 pkgname = guile-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 455852c9dc71..26d89615db69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=guile-git
 epoch=1
 _majorver=3.0
-pkgver=3.0.5.r140.g01bfd18f3
+pkgver=3.0.5.r141.g88e703084
 pkgrel=1
 pkgdesc="A portable, embeddable Scheme implementation (Git snapshot)"
 arch=('i686' 'x86_64' 'aarch64')
@@ -14,39 +14,35 @@ depends=('gc' 'libxcrypt' 'libffi' 'libunistring' 'gmp' 'readline')
 provides=('guile')
 conflicts=('guile4emacs')
 options=('!strip' '!makeflags' 'libtool')
-source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git" rename_infofile.diff)
+source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git")
 url="http://www.gnu.org/software/guile/"
-sha256sums=('SKIP'
-            'b2674297c0b4ceba1f94616f04a1bf3ae5586cc27433978a5e7e35b71e2ad53f')
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgname%-git}
   git describe --tags | sed 's+-+.r+' | sed 's+^v++' | tr - .
 }
 
-prepare() {
-  cd ${pkgname%-git}
-  git apply "$srcdir"/rename_infofile.diff
-  cd doc/ref
-  mv guile.texi guile-3.0.texi 
-}
-
 build() {
   cd ${pkgname%-git}
-  top_srcdir="$srcdir"/${pkgname%-git} top_builddir=$top_srcdir ./autogen.sh
+  ./autogen.sh
   ./configure --prefix=/usr --program-suffix=${_majorver}
   make LDFLAGS+=" -lpthread" || true
-  cd doc/ref
-  echo "@set EFFECTIVE-VERSION ${_majorver}" > effective-version.texi
-  GUILE_AUTO_COMPILE=0 "$srcdir"/${pkgname%-git}/meta/build-env guild snarf-guile-m4-docs "$srcdir"/${pkgname%-git}/meta/guile.m4 >autoconf-macros.texi
-  make 
 }
 
 package() {
   cd ${pkgname%-git}
   make DESTDIR="$pkgdir/" install
-
-  install -Dm644 "$pkgdir"/usr/share/aclocal/guile.m4 "$pkgdir"/usr/share/aclocal/guile-${_majorver}.m4
+  cd "$pkgdir"/usr/share/info
+  for i in guile*
+  do
+    mv $i guile-${_majorver}${i#guile}
+  done
+  sed -i "s/guile.info/guile-${_majorver}.info/g" guile-${_majorver}*
+  sed -i "s/guile.texi/guile-${_majorver}.texi/g" guile-${_majorver}*
+  sed -i "s/* Guile Reference: (guile)/* Guile-${_majorver} Reference: (guile-${_majorver})/g" guile-${_majorver}*
+  sed -i "s/The Guile reference manual./The Guile-${_majorver} reference manual./g" guile-${_majorver}*
+  mv r5rs.info r5rs-${_majorver}.info
   rm "$pkgdir"/usr/share/aclocal/guile.m4
   rm "$pkgdir"/usr/lib/libguile-3.0.so.*-gdb.scm
 }
diff --git a/rename_infofile.diff b/rename_infofile.diff
deleted file mode 100644
index 71125c50c375..000000000000
--- a/rename_infofile.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index f1c694551..80298ef5d 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -21,7 +21,7 @@
- 
- AUTOMAKE_OPTIONS = gnu
- 
--SUBDIRS = ref r5rs
-+SUBDIRS = ref
- 
- dist_man1_MANS = guile.1
- 
-diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
-index 2f4b8ca88..8f3805387 100644
---- a/doc/ref/Makefile.am
-+++ b/doc/ref/Makefile.am
-@@ -22,7 +22,7 @@
- 
- AUTOMAKE_OPTIONS = gnu
- 
--info_TEXINFOS = guile.texi
-+info_TEXINFOS = guile-3.0.texi
- 
- guile_TEXINFOS = preface.texi			\
-                  intro.texi			\
-@@ -128,7 +128,7 @@ autoconf-macros.texi: $(top_srcdir)/meta/guile.m4
- # triggering a rebuild of `guile.info'.  Note that `GUILE-VERSION' is
- # among $(CONFIG_STATUS_DEPENDENCIES); thus, when it's updated, this
- # Makefile is rebuilt, and $(GUILE_EFFECTIVE_VERSION) is up-to-date.
--$(srcdir)/effective-version.texi: $(top_srcdir)/GUILE-VERSION
-+effective-version.texi:
- 	echo "@set EFFECTIVE-VERSION $(GUILE_EFFECTIVE_VERSION)" > $@
- 
- MAINTAINERCLEANFILES = autoconf-macros.texi
-