update osx defaults

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 6c676cdc421edb4276a09461b18b2d4229cf7439..96d4748a4d6c98861c680bbe846e83da853da043 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -2,24 +2,29 @@ CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 EXTRA_DIST =
 
-appdatadir = /usr/share/applications
+appdatadir = $(datadir)/applications
 if !HAVE_WIN32
+if !HAVE_WINCE
 appdata_DATA = vlc.desktop
 endif
+endif
 EXTRA_DIST += vlc.desktop.in
 CLEANFILES += $(appdata_DATA)
 
 vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > $@.tmp
-       $(AM_V_at)mv -f $@.tmp $@
+       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+       $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+       $(AM_V_at)mv -f tmp-$@ $@
 
-iconsdatadir = /usr/share/icons/hicolor
+iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps
 icons32dir = $(iconsdatadir)/32x32/apps
 icons48dir = $(iconsdatadir)/48x48/apps
 icons128dir = $(iconsdatadir)/128x128/apps
 icons256dir = $(iconsdatadir)/256x256/apps
 
+if !HAVE_WIN32
+if !HAVE_WINCE
 dist_vlcdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
@@ -33,6 +38,8 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
+endif
+endif
 
 EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \