[vlc-commits] commit: contrib: Factorize the win targets. (Pierre d'Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Fri Nov  5 22:33:35 2010 +0100| [d25dc67dce3f5c775c5aec1d4dfa6fffe72df1b0] | committer: Pierre d'Herbemont 

contrib: Factorize the win targets.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d25dc67dce3f5c775c5aec1d4dfa6fffe72df1b0
---

 extras/contrib/bootstrap |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index c5380a1..4d54324 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -251,18 +251,15 @@ case $TARGET in
         fi
     ;;
     *mingw32ce)
-        add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
         EXTRA_CPPFLAGS=" -D_WIN32_WCE=0x0500"
         hint_distro wince
     ;;
     *64-*mingw*)
         add_enabled_makefile_cfg "HAVE_WIN32"
-        add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
         EXTRA_CFLAGS="-O3"
         hint_distro win64
     ;;
     *mingw32*)
-        add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
         EXTRA_CFLAGS=" -O3 -march=i686 -mtune=generic"
         hint_distro win32
     ;;
@@ -274,11 +271,9 @@ case $TARGET in
         EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
         EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
         EXTRA_LDFLAGS=" -mno-cygwin"
-        add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
         hint_distro win32
     ;;
     arm-wince-pe)
-        add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
         EXTRA_CPPFLAGS=" -D_WIN32_WCE"
         hint_distro wince
     ;;
@@ -366,6 +361,9 @@ case "$DISTRO" in
         exit 1
     fi
     ;;
+  win*)
+    add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
+    ;;
 esac
 
 # Save passed flags