fixed java, libxml2 packages

git-svn-id: svn://oss.syntext.com/oss/serna-free/trunk@110 76c9efe7-43af-4aca-a270-d8da3bf5252a

diff --git a/3rd/TMakefile.pro b/3rd/TMakefile.pro
index 54b1b1d..a8007de 100644 (file)
--- a/3rd/TMakefile.pro
+++ b/3rd/TMakefile.pro
@@ -8,7 +8,7 @@ SUBDIRS +=  \
             docbook \
             dita-ot \
             jade \
-            antlr:jdk \
+            antlr \
             aspell \
             iconv \
             libxml:iconv;python \
@@ -20,6 +20,7 @@ SUBDIRS +=  \
             pyqt:sip;iconv \
             doxygen
 
+darwin:SUBDIRS -= jdk
 
 win32:SUBDIRS += \
                 libxml-python:python;xsltproc

diff --git a/3rd/functions b/3rd/functions
index 3679473..9704950 100644 (file)
--- a/3rd/functions
+++ b/3rd/functions
@@ -119,8 +119,8 @@ install_shlib() {
             MAJ=`VER=$VER $SH -xc "echo \\${VER%%.*}"`
             symlink ${SRCDIR}/${FULLNAME} ${DSTDIR}
             symlink ${FULLNAME} ${DSTDIR}/${LIBNAME}.so.${MAJMIN}
-            symlink ${LIBNAME}.so.${MAJMIN} ${DSTDIR}/${LIBNAME}.so.${MAJ}
-            symlink ${LIBNAME}.so.${MAJ} ${DSTDIR}/${LIBNAME}.so
+            symlink ${FULLNAME} ${DSTDIR}/${LIBNAME}.so.${MAJ}
+            symlink ${FULLNAME} ${DSTDIR}/${LIBNAME}.so
         fi
     fi
 }

diff --git a/3rd/jdk/jdk-defaults.pro b/3rd/jdk/jdk-defaults.pro
index e99ef43..e690ec7 100644 (file)
--- a/3rd/jdk/jdk-defaults.pro
+++ b/3rd/jdk/jdk-defaults.pro
@@ -2,7 +2,10 @@
 PACKAGE_DIR = jdk-$$VERSION
 MAKE_DIR    = $$PACKAGE_DIR/jre
 
-ARCHIVE                 = $$ARCHIVE_DIR/jdk-$${VERSION}.tar.bz2
+linux:JAVA_PF = linux
+win32:JAVA_PF = win32
+
+ARCHIVE                 = $$ARCHIVE_DIR/jdk-$$JAVA_PF-$${VERSION}.tar.bz2
 
 PACKAGE_MAKEFILE           = $(srcdir)/JdkMakefile
 PACKAGE_CLEANOPTS          = clean

diff --git a/INSTALL b/INSTALL
index 46b466e..020d51b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -32,7 +32,6 @@
     zip
     unzip
     perl
-    java
 
   Since default Windows install does not include these tools, it's necessary to 
   install the following packages to successfully build and install Serna on Windows: