projects
/
vuplus_xbmc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4857 from t-nelson/Gotham_13.2_backports
[vuplus_xbmc]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
6f689cf
..
bee1fdd
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-481,7
+481,7
@@
FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
lib/ffmpeg/libpostproc/libpostproc.a \
lib/ffmpeg/libswscale/libswscale.a
DYNOBJSXBMC+= $(FFMPEGOBJS)
lib/ffmpeg/libpostproc/libpostproc.a \
lib/ffmpeg/libswscale/libswscale.a
DYNOBJSXBMC+= $(FFMPEGOBJS)
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
+LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
@HOGWEED_ALL_LIBS@
$(FFMPEGOBJS): dvdpcodecs
endif
$(FFMPEGOBJS): dvdpcodecs
endif
@@
-646,11
+646,11
@@
endif
endif
@# Icons and links
@install -d $(DESTDIR)$(datarootdir)/applications
endif
@# Icons and links
@install -d $(DESTDIR)$(datarootdir)/applications
- @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
+ @install
-m 0644
tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
@install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
@install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
- @install -m 0644
tools/Linux/xbmc-
48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
+ @install -m 0644
media/icon
48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
@install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
@install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
- @install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
+ @install -m 0644 media/icon
256x256
.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
@test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
@echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"
@test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
@echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"