Update some important files after installation of binaries

diff --git a/config_files/Python.sh b/config_files/Python.sh
index 11e3bf2aa5d7c72bbc659ddf31a3939924adf721..1fb368f44e683446643539828aafa6c2a4ba786e 100755 (executable)
--- a/config_files/Python.sh
+++ b/config_files/Python.sh
@@ -162,6 +162,16 @@ for sc in idle pydoc smtpd.py ; do
     fi
 done
 
+# modify pkgconfig
+if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then
+  cd ${PRODUCT_DIR}/lib/pkgconfig
+  for l in X `find . -name "*.pc"`; do
+    if [ "${l}" != "X" ] ; then
+      sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
+    fi
+  done
+fi
+
 # to generate environment scripts
 try_preinstalled
 }

diff --git a/config_files/freetype.sh b/config_files/freetype.sh
index e96e4634d651e29560f7fddab08e3afb73a36474..66c3876d9c87767a9cd7e9367920b2f8c525b935 100755 (executable)
--- a/config_files/freetype.sh
+++ b/config_files/freetype.sh
@@ -128,10 +128,12 @@ if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then
   cd ${PRODUCT_DIR}/lib/pkgconfig
   for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-      sed -i "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
+      sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
     fi
   done
 fi
+# modify config file
+sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${PRODUCT_DIR}/bin/freetype-config
 
 # to generate environment script for sources
 try_preinstalled

diff --git a/config_files/ftgl.sh b/config_files/ftgl.sh
index 30d11c830def7f3493d66a17cfe7de52211b022d..f58cabb09ee6ee039fda04d8f12d525805f6d8c5 100755 (executable)
--- a/config_files/ftgl.sh
+++ b/config_files/ftgl.sh
@@ -137,7 +137,7 @@ if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then
   cd ${PRODUCT_DIR}/lib/pkgconfig
   for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-      sed -i "s%prefix=.*%prefix=${PRODUCT_DIR}%g;s%-L[^[:space:]]*/freetype[^[:space:]]*/lib%-L${FREETYPEDIR}/lib%g;s%-I[^[:space:]]*/freetype[^[:space:]]*/include%-I${FREETYPEDIR}/include%g" ${l}
+      sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g;s%-L[^[:space:]]*/freetype[^[:space:]]*/lib%-L${FREETYPEDIR}/lib%g;s%-I[^[:space:]]*/freetype[^[:space:]]*/include%-I${FREETYPEDIR}/include%g" ${l}
     fi
   done
 fi

diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh
index d640428c56e22589841a65401fe97c0fd4379c19..8fc0f5d217809cef2aaaad79c75a5506cca6865b 100755 (executable)
--- a/config_files/graphviz.sh
+++ b/config_files/graphviz.sh
@@ -166,11 +166,11 @@ for l in X `find $ldir -name "*.la"`; do
     fi
 done
 
+# modify pkgconfig
 cd ${PRODUCT_DIR}/lib/pkgconfig
 for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-       sed -e "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} > ${l}_
-       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
+       sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
     fi
 done
 

diff --git a/config_files/libxml2.sh b/config_files/libxml2.sh
index b2bc15cc694c76e7e3e9e8b8b0a4ba7fea5bdce6..ef2154c5f4c9c1e5b8f08b701ea773e1cfc4729b 100755 (executable)
--- a/config_files/libxml2.sh
+++ b/config_files/libxml2.sh
@@ -120,9 +120,12 @@ test -f python${PYTHON_VERSION}/site-packages/libxml2mod.la && sed -i "s%^libdir
 cd ${PRODUCT_DIR}/lib/pkgconfig
 for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-       sed -i "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
+       sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
     fi
 done
+# modify config files
+sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${PRODUCT_DIR}/bin/xml2-config
+sed -i "s%XML2_LIBDIR=.*%XML2_LIBDIR=\"${PRODUCT_DIR}/lib\"%g;s%XML2_INCLUDEDIR=.*%XML2_INCLUDEDIR=\"${PRODUCT_DIR}/include/libxml2\"%g" ${PRODUCT_DIR}/lib/xml2Conf.sh
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/numpy.sh b/config_files/numpy.sh
index 18693e908baf4a0b7898e02f899025b7855abdc6..34f654e2112799d0f3cf9ad17def49f4968826e7 100755 (executable)
--- a/config_files/numpy.sh
+++ b/config_files/numpy.sh
@@ -118,7 +118,7 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 cd ${PRODUCT_DIR}/lib/pkgconfig
 for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-        sed -i "s%prefix=.*%prefix=${PRODUCT_DIR}%g;s%prefix=.*%libdir=${PRODUCT_DIR}/lib%g" ${l}
+        sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g;s%prefix=.*%libdir=${PRODUCT_DIR}/lib%g" ${l}
        sed -i "s%Libs: -L[^[:space:]]*/lib%Libs: -L${PRODUCT_DIR}/lib%g" ${l}
     fi
 done

diff --git a/config_files/omniORB.sh b/config_files/omniORB.sh
index 9ad8b2773dadc6fe8beac3112d839e1696b62965..c6f86eded5ce9b7f353fee0ac8dfdf5ed77fdb4b 100755 (executable)
--- a/config_files/omniORB.sh
+++ b/config_files/omniORB.sh
@@ -227,7 +227,7 @@ done
 cd ${PRODUCT_DIR}/lib/pkgconfig
 for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-       sed -i "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
+       sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${l}
     fi
 done
 

diff --git a/config_files/qt.sh b/config_files/qt.sh
index 9715e9a83e4a80dff79dc7fa82eeb158fbe74261..46273c7356f327c8867c49a6d994f1c44b290ff0 100755 (executable)
--- a/config_files/qt.sh
+++ b/config_files/qt.sh
@@ -161,10 +161,24 @@ for l in X `find . -name "*.pc"`; do
             -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
             -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
             -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
+            -e "s%rcc_location=.*%uic_location=${PRODUCT_DIR}/bin/rcc%g" \
+            -e "s%lupdate_location=.*%uic_location=${PRODUCT_DIR}/bin/lupdate%g" \
+            -e "s%lrelease_location=.*%uic_location=${PRODUCT_DIR}/bin/lrelease%g" \
             ${l} > ${l}_
         chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
     fi
 done
+# modify qt prl files
+cd ${PRODUCT_DIR}/lib
+for l in X `find . -name "*.prl"`; do
+    if [ "${l}" != "X" ] ; then
+        sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g;s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" ${l}
+    fi
+done
+# modify qt mkspecs
+cd ${PRODUCT_DIR}/mkspecs
+sed -i "s%QMAKE_RPATHDIR += \".*\"%QMAKE_RPATHDIR += \"${PRODUCT_DIR}/lib\"%g" qconfig.pri
+
 
 # generate qt.conf file
 cat > ${PRODUCT_DIR}/bin/qt.conf <<EOF

diff --git a/config_files/tcltk.sh b/config_files/tcltk.sh
index 5bc8a7875d3fe71ca9061ebb07da0f133c6496f1..b3a97d06b813bf98f4bc12242c4c750153c4017c 100755 (executable)
--- a/config_files/tcltk.sh
+++ b/config_files/tcltk.sh
@@ -235,6 +235,16 @@ sed -i "s%${old_prefix}%${PRODUCT_DIR}%g" tkConfig.sh
 cd ${PRODUCT_DIR}
 test `uname -m` = "x86_64" && test ! -e lib64 && ln -s lib lib64
 
+# modify pkgconfig
+if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then
+  cd ${PRODUCT_DIR}/lib/pkgconfig
+  for l in X `find . -name "*.pc"`; do
+    if [ "${l}" != "X" ] ; then
+      sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g;s%exec_prefix=.*%exec_prefix=${PRODUCT_DIR}%g;s%libdir=.*%libdir=${PRODUCT_DIR}/lib%g" ${l}
+    fi
+  done
+fi
+
 # to generate environment scripts
 try_preinstalled
 }