Commit 098b6f26 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: prepare "make install" to work.

parent 8fc10b42
......@@ -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"], [
......
......@@ -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!" ; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment