Description: Adapt build configuration for Debian
Author: Stephen Kitt <steve@sk2.org>
Forwarded: not-needed
Last-Update: 2012-05-16

--- wine-gecko.orig/wine/mozconfig-common
+++ wine-gecko/wine/mozconfig-common
@@ -7,7 +7,7 @@
 if test -z "$WINE_GECKO_OBJDIR"
 then
     echo "WARNING: WINE_GECKO_OBJDIR not set"
-    WINE_GECKO_OBJDIR=@TOPSRCDIR@/../wine_gecko
+    WINE_GECKO_OBJDIR=@TOPSRCDIR@/wine_gecko
 fi
 mk_add_options MOZ_OBJDIR=$WINE_GECKO_OBJDIR
 
--- wine-gecko.orig/wine/make_package
+++ wine-gecko/wine/make_package
@@ -64,7 +64,7 @@
 src_dir=$(pwd)
 version=$(head -n 1 $src_dir/wine/VERSION)
 dist_basename=wine_gecko-$version-$target_arch$debug
-build_dir=$src_dir/../$dist_basename
+build_dir=$src_dir/$dist_basename
 
 if [ "$force_build" = "yes" ]
 then
@@ -223,6 +223,13 @@
     then
         WINE=wine
         WINESERVER=wineserver
+        for variant in wine wine-unstable; do
+            for libpath in /usr/lib /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH); do
+                if test -x ${libpath}/${variant}/wineserver; then
+                    WINESERVER=${libpath}/${variant}/wineserver
+                fi
+            done
+        done
     else
         WINE=$WINE_BUILD_DIR/wine
         WINESERVER=$WINE_BUILD_DIR/server/wineserver
