diff --git a/general.ent b/general.ent index a40ceeb77f..bf5cef4658 100644 --- a/general.ent +++ b/general.ent @@ -119,7 +119,7 @@ $Date$ - + diff --git a/general/genlib/libusb.xml b/general/genlib/libusb.xml index bd5df9841f..57df0631ec 100644 --- a/general/genlib/libusb.xml +++ b/general/genlib/libusb.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -56,19 +56,9 @@ libusb Dependencies - Optional - - - Optional - (Required to Build the HTML User Manual) - and - DocBOOK SGML - DTD-4.2 - Optional (Required to Build the API Documentation) - and - + User Notes: @@ -81,47 +71,31 @@ Install libusb by running the following commands: -./configure --prefix=/usr --disable-build-docs && +./configure --prefix=/usr && make If you wish to build the API documentation (see the required dependencies), issue the following command: -make apidox +cd doc && +make docs && +cd .. - To test the results, issue make -k check. + This package does not come with a test suite. Now, as the root user: make install - If you built the HTML user manual (by having the required - dependencies installed and removing the - --disable-build-docs parameter from the - configure command), install it using the following - commands as the root user: - -install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/html && -install -v -m644 doc/html/* /usr/share/doc/libusb-&libusb-version;/html - If you built the API documentation, install it using the following commands as the root user: install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs && -install -v -m644 apidocs/html/* \ +install -v -m644 doc/html/* \ /usr/share/doc/libusb-&libusb-version;/apidocs - - Command Explanations - - --disable-build-docs: This switch avoids - building the HTML user manual. Remove it if you have the required - dependencies installed and wish to build the manual. - - - Configuring Libusb @@ -188,12 +162,12 @@ SYSFS{idProduct}=="4002", GROUP:="scanner" Installed Program Installed Libraries - Installed Directory + Installed Directories - libusb-config - libusb.{so,a} and libusbpp.{so,a} - /usr/share/doc/libusb-&libusb-version; + None + libusb-1.0.{so,a} + /usr/include/libusb-1.0 and /usr/share/doc/libusb-&libusb-version; @@ -202,25 +176,13 @@ SYSFS{idProduct}=="4002", GROUP:="scanner" - - libusb-config - - is a script that provides the right compiler and linker - flags for programs using - libusb. - - libusb-config - - - - libusb.{so,a} libraries contain C functions for accessing USB hardware. - libusb.{so,a} + libusb-1.0.{so,a} diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index c2099ecb13..ca4a70d951 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -43,6 +43,9 @@ December 28th, 2008 + + [bdubbs] - Updated to libusb-1.0.0. + [bdubbs] - Updated to glib-2.18.3.