[Lunar-commits] <moonbase> docbook-sgml, xml: fixed build on 64bit Lunars I installed 64bit Lunar (1.6.5 64bit iso) and reproduced reported issues on 64bit Lunars. Whole docbook-profile module compiled after clean install of iso. The compilation went fine. No build errors.

Zbigniew Luszpinski zbiggy at lunar-linux.org
Mon Sep 6 02:53:02 CEST 2010 

commit 60bcd3f117dac1fcc0a03f1dbb328ce1522468fb
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Sep 6 02:53:02 2010 +0200

    docbook-sgml,xml: fixed build on 64bit Lunars
    I installed 64bit Lunar (1.6.5 64bit iso) and reproduced reported issues on 64bit Lunars.
    Whole docbook-profile module compiled after clean install of iso.
    The compilation went fine. No build errors.
---
 doc-tools/docbook-sgml/BUILD        |    5 +----
 doc-tools/docbook-sgml/POST_INSTALL |   12 +++++++++---
 doc-tools/docbook-sgml/PRE_BUILD    |    7 ++-----
 doc-tools/docbook-xml/BUILD         |    6 ++----
 doc-tools/docbook-xml/DETAILS       |    4 ++--
 doc-tools/docbook-xml/POST_INSTALL  |   11 ++++++++---
 doc-tools/docbook-xml/PRE_BUILD     |    7 ++-----
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/doc-tools/docbook-sgml/BUILD b/doc-tools/docbook-sgml/BUILD
index 1d0876c..c9f8343 100644
--- a/doc-tools/docbook-sgml/BUILD
+++ b/doc-tools/docbook-sgml/BUILD
@@ -1,8 +1,5 @@
 (
 
-  find $BUILD_DIRECTORY/sgml -type d -exec chmod 755 {} \;
-  find $BUILD_DIRECTORY/sgml -type f -exec chmod 644 {} \;
-
   for DOCBOOK in `ls`; do
       cd $DOCBOOK
       ln -sf docbook.cat catalog
@@ -12,6 +9,6 @@
   prepare_install &&
   rm -rf old.libraries &&
   mkdir -p /usr/share/sgml/docbook &&
-  cp -af $BUILD_DIRECTORY/sgml /usr/share/sgml/docbook
+  cp -rf $BUILD_DIRECTORY/sgml /usr/share/sgml/docbook
 
 ) > $C_FIFO 2>&1
diff --git a/doc-tools/docbook-sgml/POST_INSTALL b/doc-tools/docbook-sgml/POST_INSTALL
index dd0c6e5..76eae0d 100644
--- a/doc-tools/docbook-sgml/POST_INSTALL
+++ b/doc-tools/docbook-sgml/POST_INSTALL
@@ -5,12 +5,18 @@ if ! [ -e "$CENTRALIZED" ]; then
      touch $CENTRALIZED
 fi
 
-for DOCBOOK_INSTALL_DIR in `ls -d /usr/share/sgml/docbook/sgml/*`
+DOCBOOK_INSTALL_DIR=/usr/share/sgml/docbook/sgml
+for DOCBOOK in `ls -d $DOCBOOK_INSTALL_DIR/*`
 do
-install-catalog --add $CENTRALIZED $DOCBOOK_INSTALL_DIR/catalog
+install-catalog --add $CENTRALIZED $DOCBOOK/catalog
 done
 # Do not loopback (breaks docbook-utils build)
 install-catalog -r $CENTRALIZED /etc/sgml/catalog
+
+find $DOCBOOK_INSTALL_DIR -type d -exec chmod 755 {} \;
+find $DOCBOOK_INSTALL_DIR -type f -exec chmod 644 {} \;
+chown -R root:root $DOCBOOK_INSTALL_DIR
+
 if module_installed docbook-utils; then
   lin -rc docbook-utils
-fi
\ No newline at end of file
+fi
diff --git a/doc-tools/docbook-sgml/PRE_BUILD b/doc-tools/docbook-sgml/PRE_BUILD
index b9570c4..a50bf05 100644
--- a/doc-tools/docbook-sgml/PRE_BUILD
+++ b/doc-tools/docbook-sgml/PRE_BUILD
@@ -1,10 +1,7 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-mkdir 3.1 &&
-mkdir 4.1 &&
-mkdir 4.2 &&
-mkdir 4.3 &&
-mkdir 4.5 &&
+for dir in '3.1 4.1 4.2 4.3 4.5'
+do mkdir $dir; done &&
 unzip $SOURCE_CACHE/$SOURCE1 -d $SOURCE_DIRECTORY/3.1 &&
 unzip $SOURCE_CACHE/$SOURCE2 -d $SOURCE_DIRECTORY/4.1 &&
 unzip $SOURCE_CACHE/$SOURCE3 -d $SOURCE_DIRECTORY/4.2 &&
diff --git a/doc-tools/docbook-xml/BUILD b/doc-tools/docbook-xml/BUILD
index 4a9685b..1d130d3 100644
--- a/doc-tools/docbook-xml/BUILD
+++ b/doc-tools/docbook-xml/BUILD
@@ -1,8 +1,5 @@
 (
 
-  find $BUILD_DIRECTORY/xml -type d -exec chmod 755 {} \;
-  find $BUILD_DIRECTORY/xml -type f -exec chmod 644 {} \;
-
   for DOCBOOK in `ls`; do
       cd $DOCBOOK
       ln -sf docbook.cat catalog
@@ -11,7 +8,8 @@
 
   prepare_install &&
   rm -rf old.libraries &&
-  cp -a $BUILD_DIRECTORY/xml /usr/share/sgml/docbook &&
+  mkdir -p /usr/share/sgml/docbook &&
+  cp -rf $BUILD_DIRECTORY/xml /usr/share/sgml/docbook &&
   install -m755 $SOURCE_CACHE/$SOURCE2 /usr/bin
 
 ) > $C_FIFO 2>&1
diff --git a/doc-tools/docbook-xml/DETAILS b/doc-tools/docbook-xml/DETAILS
index facab89..bbb4f5c 100644
--- a/doc-tools/docbook-xml/DETAILS
+++ b/doc-tools/docbook-xml/DETAILS
@@ -4,8 +4,8 @@
          SOURCE2=buildDocBookCatalog
          SOURCE3=$MODULE-4.5.zip
          SOURCE4=docbkx412.zip
-	 SOURCE5=$MODULE-4.2.zip
-	 SOURCE6=$MODULE-4.4.zip
+         SOURCE5=$MODULE-4.2.zip
+         SOURCE6=$MODULE-4.4.zip
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/xml
   SOURCE1_URL[0]=http://www.oasis-open.org/docbook/xml/4.3
   SOURCE1_URL[1]=http://www.docbook.org/xml/4.3
diff --git a/doc-tools/docbook-xml/POST_INSTALL b/doc-tools/docbook-xml/POST_INSTALL
index f3b0e8e..0d4e285 100644
--- a/doc-tools/docbook-xml/POST_INSTALL
+++ b/doc-tools/docbook-xml/POST_INSTALL
@@ -1,16 +1,21 @@
-CENTRALIZED=/etc/sgml/catalog 
+CENTRALIZED=/etc/sgml/catalog
 if ! [ -e "$CENTRALIZED" ]; then
      echo "Creating $CENTRALIZED"
      mkdir -p /etc/sgml
      touch $CENTRALIZED
 fi
 
-for DOCBOOK_INSTALL_DIR in `ls -d /usr/share/sgml/docbook/xml/*`
+DOCBOOK_INSTALL_DIR=/usr/share/sgml/docbook/xml
+for DOCBOOK in `ls -d $DOCBOOK_INSTALL_DIR/*`
 do
-install-catalog --add $CENTRALIZED $DOCBOOK_INSTALL_DIR/catalog
+install-catalog --add $CENTRALIZED $DOCBOOK/catalog
 done
 rm -rf /usr/share/sgml/docbook/old.libraries
 
+find $DOCBOOK_INSTALL_DIR -type d -exec chmod 755 {} \;
+find $DOCBOOK_INSTALL_DIR -type f -exec chmod 644 {} \;
+chown -R root:root $DOCBOOK_INSTALL_DIR 
+
 /usr/bin/$SOURCE2 --prefix=/etc/xml --version=4.1.2
 /usr/bin/$SOURCE2 --prefix=/etc/xml --version=4.2
 /usr/bin/$SOURCE2 --prefix=/etc/xml --version=4.3
diff --git a/doc-tools/docbook-xml/PRE_BUILD b/doc-tools/docbook-xml/PRE_BUILD
index 6047961..e7c88a7 100644
--- a/doc-tools/docbook-xml/PRE_BUILD
+++ b/doc-tools/docbook-xml/PRE_BUILD
@@ -1,10 +1,7 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-mkdir 4.1.2 &&
-mkdir 4.2 &&
-mkdir 4.3 &&
-mkdir 4.4 &&
-mkdir 4.5 &&
+for dir in '4.1.2 4.2 4.3 4.4 4.5'
+do mkdir $dir; done &&
 unzip $SOURCE_CACHE/$SOURCE4 -d $SOURCE_DIRECTORY/4.1.2 &&
 unzip $SOURCE_CACHE/$SOURCE5 -d $SOURCE_DIRECTORY/4.2 &&
 unzip $SOURCE_CACHE/$SOURCE1 -d $SOURCE_DIRECTORY/4.3 &&

More information about the Lunar-commits mailing list