Changeset 22197

Timestamp:

2010-05-28T17:52:03+12:00 (14 years ago)

Author:

davidb

Message:

fixing up configure variable test

Location:

gs2-extensions/music-stand/trunk/runtime-srcpack/packages/CASCADE-MAKE

Files:

• EVINCE.sh (modified) (4 diffs)
• ICON-NAMING-UTILS.sh (modified) (1 diff)

gs2-extensions/music-stand/trunk/runtime-srcpack/packages/CASCADE-MAKE/EVINCE.sh

@@ -1 @@
-#!/bin/bash
+    #!/bin/bash
 
 package=evince
@@ -10 +10 @@
 prefix=$GEXTMUSICSTAND_INSTALLED
 
-export CFLAGS="-I$prefix/include -I$prefix/include/poppler/glib/"
+export CFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib"
 
@@ -31 +31 @@
     --disable-scrollkeeper --without-keyring
 
+if [ ! -z $CROSSCOMPILE ] ; then
+  if [ $force_config = "1" ] ; then
+    echo "Changing libtool to cross-compiled version"
+    /bin/cp $prefix/bin/arm-poky-linux-gnueabi-libtool $package$version/libtool
+  fi
+fi
+
 opt_run_make $compile   $package $version
 opt_run_make $install   $package $version "install"
@@ -37 +44 @@
     if [ $install = "1" ] ; then
       pushd $prefix/lib ; 
-      for f in libdocument.la libpdf; do
+      for f in libevbackend.la; do
         sed -i~ -e "s; /usr/lib/; /usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr/lib/;g" $f
       done

gs2-extensions/music-stand/trunk/runtime-srcpack/packages/CASCADE-MAKE/ICON-NAMING-UTILS.sh

@@ -17 +17 @@
 opt_run_configure $force_config $auto_config $package $version "$prefix"
 
-if [ $configure = "1" ] ; then
+if [ $force_config = "1" ] ; then
   echo "If configure fails because it cannot detect XML::Simple"
   echo "then one solution is do the following sudo command: "