From 4e26d0bbc168946a18692dcde8bff27ead57aafa Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Apr 2013 14:49:37 +0000 Subject: [PATCH] Minor changes --- config_files/freetype.sh | 7 +++---- config_files/ftgl.sh | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config_files/freetype.sh b/config_files/freetype.sh index b579212..e96e463 100755 --- a/config_files/freetype.sh +++ b/config_files/freetype.sh @@ -82,13 +82,12 @@ install_source test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} cd ${PRODUCT_SRC_DIR} -FREETYPE_CONFIGURE_OPTIONS="" + +FREETYPE_CONFIGURE_OPTIONS="--prefix=${PRODUCT_DIR}" if test `uname -m` = "x86_64" ; then -FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} CFLAGS='-m64 -fPIC' CPPFLAGS='-m64 -fPIC'" + FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} CFLAGS='-m64 -fPIC' CPPFLAGS='-m64 -fPIC'" fi -FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} --prefix=${PRODUCT_DIR}" - #congigure check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${FREETYPE_CONFIGURE_OPTIONS} diff --git a/config_files/ftgl.sh b/config_files/ftgl.sh index c084bec..979a82b 100755 --- a/config_files/ftgl.sh +++ b/config_files/ftgl.sh @@ -82,7 +82,6 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} cd ${PRODUCT_SRC_DIR} FTGL_CONFIGURE_OPTIONS="" - FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --enable-shared=yes --prefix=${PRODUCT_DIR}" FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-ft-prefix=${FREETYPEDIR}" FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-inc=/usr/include" @@ -102,6 +101,9 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make # install check_job ${PRODUCT_DIR}/INSTALL.LOG make install +# fix libGL dependecies +cd ${PRODUCT_DIR}/lib && fix_gl_libs + cd ${PRODUCT_DIR}; # remove sources and temporary files after building -- 2.39.2