Ticket #974: hulahop-dirname-version-policy-agnostic.patch

File hulahop-dirname-version-policy-agnostic.patch, 675 bytes (added by sascha_silbe, 13 years ago)

support for Debian-style xulrunner directory names

  • configure.ac

    diff --git a/configure.ac b/configure.ac
    index 39506be..464755d 100644
    a b PKG_CHECK_MODULES([LIBXUL],[libxul]) 
    3838# FIXME To be able to use pyxpcom we currently need
    3939# to link to xpcom at build time. Which involves various hacks.
    4040LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul`
    41 LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`"
     41LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`basename $LIBXUL_SDK_DIR|sed -e 's/^.*-\(@<:@0-9.@:>@\+\)$/\1/'`"
    4242LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom"
    4343
    4444LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`