Fix #1515 - vlc.exe icon

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e04647973e0cde1f8d163be0e1281c91ce1ca98..a813e72f941c37ad3a03362873e59fe25ae5576b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym vlc-control.pc.in
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -380,7 +380,7 @@ SOURCES_libvlc_control = \
 misc/revision.c:
        rm -f $@ $@.tmp
        echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-       REVISION="$$(LANG=C git-show-ref -s HEAD 2>/dev/null | cut -b -10 || echo exported)"; \
+       REVISION="$$((LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported) | cut -b -10)"; \
        echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
        mv -f $@.tmp $@
 
@@ -410,7 +410,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        eval $$cmd
 
 if HAVE_WIN32
-DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
+DATA_win32_rc = $(noinst_DATA)
 noinst_DATA = vlc_win32_rc.$(OBJEXT)
 
 vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc