diff options
author | theuni <theuni-nospam-@xbmc.org> | 2011-01-24 16:05:21 -0500 |
---|---|---|
committer | theuni <theuni-nospam-@xbmc.org> | 2011-01-24 16:05:21 -0500 |
commit | c51b1189e3d5353e842991f5859ddcea0f73e426 (patch) | |
tree | ef2cb8a6184699aa614f3655dca4ce661cdc108e /addons/skin.confluence/media | |
parent | be61ebdc9e897fe40c6f371111724de79ddee8d5 (diff) |
Merged cptspiff's code-reshuffle branch.
Squashed commit due to build breakage during code-reshuffle history.
Conflicts:
xbmc/Util.cpp
xbmc/cdrip/CDDARipper.cpp
xbmc/filesystem/Directory.cpp
xbmc/filesystem/File.cpp
Diffstat (limited to 'addons/skin.confluence/media')
-rw-r--r-- | addons/skin.confluence/media/Makefile.in (renamed from addons/skin.confluence/media/Makefile) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/skin.confluence/media/Makefile b/addons/skin.confluence/media/Makefile.in index d8aaf26d1d..734420be09 100644 --- a/addons/skin.confluence/media/Makefile +++ b/addons/skin.confluence/media/Makefile.in @@ -1,5 +1,5 @@ TARGET=Textures.xbt -XBMCTEX=../../../tools/TexturePacker/TexturePacker +XBMCTEX=@abs_top_srcdir@/tools/TexturePacker/TexturePacker IMAGES= \ ArrowDown.png \ ArrowUp.png \ @@ -321,7 +321,7 @@ $(TARGET): $(XBMCTEX) $(IMAGES) $(XBMCTEX) -input . -output $(TARGET) $(XBMCTEX): force - $(MAKE) -C ../../../tools/TexturePacker + $(MAKE) -C @abs_top_srcdir@/tools/TexturePacker clean: rm -f $(TARGET) |