diff --git a/general/prog/guile.xml b/general/prog/guile.xml
index 0c89d12910..f466583241 100644
--- a/general/prog/guile.xml
+++ b/general/prog/guile.xml
@@ -98,24 +98,15 @@
commands:
-./configure --prefix=/usr --disable-static &&
+./configure --prefix=/usr \
+ --disable-static \
+ --docdir=/usr/share/doc/guile-&guile-version; &&
make &&
make html &&
makeinfo --plaintext -o doc/r5rs/r5rs.txt doc/r5rs/r5rs.texi &&
makeinfo --plaintext -o doc/ref/guile.txt doc/ref/guile.texi
-
- If you have installed and wish to build alternate
- formats (PDF and postscript) of the documentation, issue the following
- commands:
-
-
-for DIRNAME in r5rs ref; do
- make -k -C doc/${DIRNAME} pdf ps
-done &&
-unset DIRNAME
-
To test the results, issue: make check.
@@ -124,37 +115,20 @@ unset DIRNAME
Now, as the root user:
-make install &&
+make install &&
+make install-html &&
-find examples -name "Makefile*" -delete &&
-install -v -dm755 /usr/share/doc/guile-&guile-version; &&
-cp -vR examples /usr/share/doc/guile-&guile-version; &&
+mv /usr/share/doc/guile-&guile-version;/{guile.html,ref} &&
+mv /usr/share/doc/guile-&guile-version;/r5rs{.html,} &&
+
+find examples -name "Makefile*" -delete &&
+cp -vR examples /usr/share/doc/guile-&guile-version; &&
for DIRNAME in r5rs ref; do
- install -v -dm755 /usr/share/doc/guile-&guile-version;/${DIRNAME} &&
-
install -v -m644 doc/${DIRNAME}/*.txt \
- /usr/share/doc/guile-&guile-version;/${DIRNAME} &&
-
- if [ -d doc/${DIRNAME}/${DIRNAME}.html ]; then
- cp -Rv doc/${DIRNAME}/${DIRNAME}.html \
/usr/share/doc/guile-&guile-version;/${DIRNAME}
- fi
-done
-
-cp -vR doc/ref/guile.html /usr/share/doc/guile-&guile-version;/ref
-
-
- If you built the alternate formats of the documentation, install them
- using the following commands issued by the
- root user:
-
-
-for DIRNAME in r5rs ref
-do
- install -v -m644 doc/${DIRNAME}/*.{pdf,ps,dvi} \
- /usr/share/doc/guile-&guile-version;/${DIRNAME}
-done
+done &&
+unset DIRNAME
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index 72744ca330..0b2ccd61b1 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -183,8 +183,9 @@
--enable-libx264 \
--enable-x11grab &&
make &&
-gcc tools/qt-faststart.c -o tools/qt-faststart &&
-unset LIBRARY_PATH
+gcc tools/qt-faststart.c -o tools/qt-faststart
+
HTML documentation was built in the previous step if
diff --git a/x/installing/libva.xml b/x/installing/libva.xml
index 8da8bb6aa1..d514186d8e 100644
--- a/x/installing/libva.xml
+++ b/x/installing/libva.xml
@@ -50,7 +50,7 @@
subpicture blending, and rendering.
- &lfs74_built;
+ &lfs75_built;
Package Information