log of fixes in last submission
--
Jasmine Iwanek
--- trunk.orig/chapter37/alsa-tools.xml 2005-09-07 12:31:34.000000000 +0000
+++ trunk/chapter37/alsa-tools.xml 2005-08-07 12:21:08.000000000 +0000
@@ -49,11 +49,6 @@
<stageinfo>
<base>&build_dir;/&alsa-tools-directory;/as10k1</base>
</stageinfo>
- <execute command="sed">
- <param>-i</param>
- <param>-e "s/^next_cli_arg:/&real-amp;\n\n\tbreak;/"</param>
- <param>as10k1.c</param>
- </execute>
<configure>
<param>--prefix=/usr</param>
</configure>
--- trunk/chapter04/mitkrb.xml 2005-09-14 16:50:53.000000000 +0000
+++ trunk/chapter04/mitkrb.xml 2005-08-15 10:04:07.000000000 +0000
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
<!ENTITY % general_entities SYSTEM "../config/general.ent">
<!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
<!ENTITY % config_entities SYSTEM "../config/config.ent">
diff -urN trunk.orig/chapter08/libusb.xml trunk/chapter08/libusb.xml
--- trunk.orig/chapter08/libusb.xml 2005-07-31 20:18:07.000000000 +0000
+++ trunk/chapter08/libusb.xml 2005-10-01 17:02:16.000000000 +0000
@@ -78,7 +78,7 @@
</mkdir>
<copy>
<source>apidocs/html/*</source>
- <name>/usr/share/doc/libusb-&libusb-version;/apidocs</name>
+
<destination>/usr/share/doc/libusb-&libusb-version;/apidocs</destination>
</copy>
-->
</stage>
diff -urN trunk.orig/chapter18/samba.xml trunk/chapter18/samba.xml
--- trunk.orig/chapter18/samba.xml 2005-10-01 13:10:49.000000000 +0000
+++ trunk/chapter18/samba.xml 2005-10-01 20:58:14.000000000 +0000
@@ -69,6 +69,8 @@
<param>--with-piddir=/var/run</param>
<param>--with-fhs</param>
<param>--with-smbmount</param>
+ <!-- uncoment to enable linking with pam -->
+ <!-- <param>- -with-pam</param> -->
</configure>
<make />
<make>
@@ -87,6 +89,13 @@
<name>/usr/include/libsmbclient.h</name>
<name>/usr/lib/samba/libsmbclient.a</name>
</permissions>
+ <!-- uncomment if linking with pam -->
+ <!--
+ <copy>
+ <source>nsswitch/pam_winbind.so</source>
+ <destination>/lib/securetty</destination>
+ </copy>
+ -->
<copy>
<source>nsswitch/libnss_wins.so</source>
<source>nsswitch/libnss_winbind.so</source>
diff -urN trunk.orig/chapter23/postgresql.xml trunk/chapter23/postgresql.xml
--- trunk.orig/chapter23/postgresql.xml 2005-07-21 14:22:02.000000000 +0000
+++ trunk/chapter23/postgresql.xml 2005-10-01 20:23:49.000000000 +0000
@@ -15,7 +15,6 @@
<!ENTITY % package_entities_extra SYSTEM "../config/packages/ch43.ent">
%package_entities_extra;
-
]>
<alfs>
<package name="postgresql" version="&postgresql-version;">
diff -urN trunk.orig/chapter26/qt-opt.xml trunk/chapter26/qt-opt.xml
--- trunk.orig/chapter26/qt-opt.xml 2005-10-01 13:10:49.000000000 +0000
+++ trunk/chapter26/qt-opt.xml 2005-10-01 20:28:56.000000000 +0000
@@ -46,7 +46,7 @@
</packageinfo>
<stage name="Unpacking">
<unpack>
- <digest>&qt-opt-md5;</digest>
+ <digest>&qt-md5;</digest>
<archive>&packages_dir;/&qt-package;</archive>
<destination>&build_dir;</destination>
</unpack>
diff -urN trunk.orig/chapter28/kdebase.xml trunk/chapter28/kdebase.xml
--- trunk.orig/chapter28/kdebase.xml 2005-09-07 12:31:36.000000000 +0000
+++ trunk/chapter28/kdebase.xml 2005-10-01 20:53:35.000000000 +0000
@@ -97,6 +97,12 @@
<param>--disable-dependency-tracking</param>
</configure>
<make />
+ <!-- Uncomment to build api docs -->
+ <!--
+ <make>
+ <param>apidox</param>
+ </make>
+ -->
<make>
<param>install</param>
</make>
diff -urN trunk.orig/chapter28/kdelibs.xml trunk/chapter28/kdelibs.xml
--- trunk.orig/chapter28/kdelibs.xml 2005-09-07 12:31:36.000000000 +0000
+++ trunk/chapter28/kdelibs.xml 2005-10-01 17:11:15.000000000 +0000
@@ -89,6 +89,12 @@
<param>--enable-fast-malloc=full</param>
</configure>
<make />
+ <!-- uncomment to build api docs -->
+ <!--
+ <make>
+ <param>apidox</param>
+ </make>
+ -->
<make>
<param>install</param>
</make>
diff -urN trunk.orig/chapter29/kdegames.xml trunk/chapter29/kdegames.xml
--- trunk.orig/chapter29/kdegames.xml 2005-07-21 14:22:04.000000000 +0000
+++ trunk/chapter29/kdegames.xml 2005-10-01 17:14:57.000000000 +0000
@@ -46,6 +46,12 @@
<param>--disable-dependency-tracking</param>
</configure>
<make />
+ <!-- Uncomment to build api docs -->
+ <!--
+ <make>
+ <param>apidox</param>
+ </make>
+ -->
<make>
<param>install</param>
</make>
diff -urN trunk.orig/chapter29/kdepim.xml trunk/chapter29/kdepim.xml
--- trunk.orig/chapter29/kdepim.xml 2005-09-07 12:31:36.000000000 +0000
+++ trunk/chapter29/kdepim.xml 2005-10-01 17:15:50.000000000 +0000
@@ -74,6 +74,12 @@
<param>--disable-dependency-tracking</param>
</configure>
<make />
+ <!-- uncomment to build api docs -->
+ <!--
+ <make>
+ <param>apidox</param>
+ </make>
+ -->
<make>
<param>install</param>
</make>
diff -urN trunk.orig/chapter29/kdevelop.xml trunk/chapter29/kdevelop.xml
--- trunk.orig/chapter29/kdevelop.xml 2005-09-07 12:31:36.000000000 +0000
+++ trunk/chapter29/kdevelop.xml 2005-10-01 17:08:08.000000000 +0000
@@ -52,6 +52,12 @@
<param>--disable-dependency-tracking</param>
</configure>
<make />
+ <!-- uncomment to build api docs -->
+ <!--
+ <make>
+ <param>apidox</param>
+ </make>
+ -->
<make>
<param>install</param>
</make>
diff -urN trunk.orig/chapter34/koffice.xml trunk/chapter34/koffice.xml
--- trunk.orig/chapter34/koffice.xml 2005-07-31 20:18:05.000000000 +0000
+++ trunk/chapter34/koffice.xml 2005-10-01 17:12:45.000000000 +0000
@@ -77,6 +77,12 @@
<param>--disable-dependency-tracking</param>
</configure>
<make />
+ <!-- uncomment to build api docs -->
+ <!--
+ <make>
+ <param>apidox</param>
+ </make>
+ -->
<make>
<param>install</param>
</make>
diff -urN trunk.orig/chapter43/docbook-utils.xml
trunk/chapter43/docbook-utils.xml
--- trunk.orig/chapter43/docbook-utils.xml 2005-07-31 20:18:07.000000000
+0000
+++ trunk/chapter43/docbook-utils.xml 2005-10-01 17:25:26.000000000 +0000
@@ -46,6 +46,7 @@
<stageinfo>
<base>&build_dir;/&docbook-utils-directory;</base>
</stageinfo>
+ <execute command="sed -i 's:/html::' doc/HTML/Makefile.in" />
<configure>
<param>--prefix=/usr</param>
</configure>
diff -urN trunk.orig/chapter45/xpdf.xml trunk/chapter45/xpdf.xml
--- trunk.orig/chapter45/xpdf.xml 2005-07-21 14:22:03.000000000 +0000
+++ trunk/chapter45/xpdf.xml 2005-10-01 20:45:39.000000000 +0000
@@ -71,6 +71,8 @@
<param>--prefix=/usr</param>
<param>--sysconfdir=/etc</param>
<param>--with-freetype2-includes=/usr/include/freetype2</param>
+ <!-- uncomment to make A4 paper default -->
+ <!-- <param>- -enable-a4-paper</param>-->
</configure>
<make />
<make>
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page