Win32: prepare "make install" to work.

diff --git a/configure.ac b/configure.ac
index 1a428e7223f348eafe3a5ac4d7b4fb6ae0183341..c70975881d4cebdfb136379521c91cfefd53c8ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -339,17 +339,20 @@ case "${host_os}" in
         dnl
         AC_ARG_ENABLE(peflags,
           [  --enable-peflags        peflags use (default enabled on Windows)])
-        if test "${enable_peflags}" != "no"
-        then
+        if test "${enable_peflags}" != "no" ; then
           AC_CHECK_TOOL(PEFLAGS, peflags, :)
         fi
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
+        ac_default_prefix="`pwd`/_win32"
+        DESTDIR="`pwd`/_win32/"
     fi
     if test "${SYS}" = "mingwce"; then
         # add ws2 for closesocket, select, recv
         VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
         VLC_ADD_LIBS([libvlccore],[-lmmtimer])
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
+        ac_default_prefix="`pwd`/_wince"
+        DESTDIR="`pwd`/_wince/"
    fi
     ;;
   *nto*)
@@ -4319,7 +4322,10 @@ AS_IF([test "x$KDE4_CONFIG" = "x"], [
 AC_ARG_WITH(kde-solid,
   AS_HELP_STRING([--with-kde-solid=PATH],
                  [KDE Solid actions directory (auto)]),, [
+
+if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ; then
   with_kde_solid="yes"
+fi
 ])
 soliddatadir=""
 AS_IF([test "${with_kde_solid}" != "no"], [

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 52288cfed8a4adbfb0787f0de33759888ef73aef..39abdbc73419b5b15e650935608fd24d723c3103 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -70,7 +70,7 @@ stamp-cache:
        $(AM_V_at)touch stamp-cache
 
 install-exec-hook:
-       if test -z "$(DESTDIR)"; then \
+       if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
                ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
        else \
                echo "Staged installation: cache generation skipped!" ; \