Anonymous

Index: configure
===================================================================
--- configure	(revision 12772)
+++ configure	(working copy)
@@ -578,6 +578,7 @@
 PACKAGE_STRING='"xbmc" 2.1'
 PACKAGE_BUGREPORT='bugs@xboxmediacenter.com'
 
+ac_default_prefix="/usr/share"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1736,6 +1737,7 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug; use_debug=$enableval
@@ -12640,7 +12642,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile"
+ac_config_files="$ac_config_files Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile tools/Linux/xbmc.sh"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13199,6 +13201,7 @@
     "Makefile.include") CONFIG_FILES="$CONFIG_FILES Makefile.include" ;;
     "xbmc/lib/libPython/linux/Makefile") CONFIG_FILES="$CONFIG_FILES xbmc/lib/libPython/linux/Makefile" ;;
     "xbmc/lib/libUPnP/Makefile") CONFIG_FILES="$CONFIG_FILES xbmc/lib/libUPnP/Makefile" ;;
+    "tools/Linux/xbmc.sh") CONFIG_FILES="$CONFIG_FILES tools/Linux/xbmc.sh" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -13758,5 +13761,5 @@
 fi
 
 
-final_message="$final_message\n$dashes"
+final_message="$final_message\n  prefix:\t$prefix\n$dashes"
 echo -e "$final_message\n"
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 12771)
+++ Makefile.in	(working copy)
@@ -80,13 +80,13 @@
 xbmc-xrandr: xbmc-xrandr.c
 	gcc -g -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lXrender -lX11 
 
-install:
-	@echo "Creating target directories in /usr/share/xbmc"
-	@find language media screensavers scripts skin sounds userdata visualisations system -type d -not -iregex ".*svn.*" -exec mkdir -p /usr/share/xbmc/"{}" \; -printf " -- %f                           \r"
-	@echo "Copying system files to /usr/share/xbmc"
-	@find language media screensavers scripts skin sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*osx.*|.*x86_64.*|.*\.dll" -exec cp "{}" /usr/share/xbmc/"{}" \; -printf " -- %f                           \r"
-	@echo "Copying XBMC binary to /usr/share/xbmc/xbmc.bin"
-	@cp XboxMediaCenter /usr/share/xbmc/xbmc.bin
+install: all
+	@echo "Creating target directories in $(prefix)/xbmc"
+	@find language media screensavers scripts skin sounds userdata visualisations system -type d -not -iregex ".*svn.*" -exec mkdir -p $(prefix)/xbmc/"{}" \; -printf " -- %f                           \r"
+	@echo "Copying system files to $(prefix)/xbmc"
+	@find language media screensavers scripts skin sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*osx.*|.*x86_64.*|.*\.dll" -exec cp "{}" $(prefix)/xbmc/"{}" \; -printf " -- %f                           \r"
+	@echo "Copying XBMC binary to $(prefix)/xbmc/xbmc.bin"
+	@cp XboxMediaCenter $(prefix)/xbmc/xbmc.bin
 	@cp tools/Linux/xbmc.sh /usr/bin/xbmc
 	@chmod 755 /usr/bin/xbmc
 	@echo "Done!"
@@ -94,7 +94,7 @@
 
 uninstall:
 	@echo "Removing XBMC..."
-	@rm -rf /usr/share/xbmc /usr/bin/xbmc
+	@rm -rf $(prefix)/xbmc /usr/bin/xbmc
 	@echo "Done!"
 
 include Makefile.include
Index: xbmc/linux/PlatformDefs.h
===================================================================
--- xbmc/linux/PlatformDefs.h	(revision 12771)
+++ xbmc/linux/PlatformDefs.h	(working copy)
@@ -43,8 +43,6 @@
 
 #define XXLog(a,b) printf("%s", (b))
 
-#define INSTALL_PATH    "/usr/share/xbmc"
-
 #define CONST		const
 #define FALSE		0
 #define TRUE		1
Index: Makefile.include.in
===================================================================
--- Makefile.include.in	(revision 12771)
+++ Makefile.include.in	(working copy)
@@ -1,12 +1,12 @@
 AR=ar
 ARFLAGS=rus
 RM=rm -f
-
+prefix=@prefix@
 CXX=@CXX@
 CC=@CC@
 CFLAGS+=@DEBUG_FLAGS@
 CFLAGS+=@LZO_INCLUDES@
-DEFINES+=-D_LINUX -D_FILE_DEFINED -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @SDL_DEFINES@
+DEFINES+=-D_LINUX -D_FILE_DEFINED -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @SDL_DEFINES@ -DINSTALL_PATH="\"$(prefix)/xbmc\""
 
 .cpp.o:
 	rm -f ${<:.cpp=.o}
Index: configure.in
===================================================================
--- configure.in	(revision 12772)
+++ configure.in	(working copy)
@@ -4,6 +4,7 @@
 AC_PREREQ(2.59)
 AC_INIT("xbmc", 2.1, bugs@xboxmediacenter.com)
 AC_CONFIG_HEADER([config.h])
+AC_PREFIX_DEFAULT("/usr/share")
 
 AC_ARG_ENABLE([debug],
             [AS_HELP_STRING([--enable-debug],
@@ -295,8 +296,8 @@
 AC_SUBST(DEBUG_FLAGS)
 AC_SUBST(SDL_DEFINES)
 AC_SUBST(LZO_INCLUDES)
-AC_CONFIG_FILES([Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile])
+AC_CONFIG_FILES([Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile tools/Linux/xbmc.sh])
 AC_OUTPUT
 
-final_message="$final_message\n$dashes"
+final_message="$final_message\n  prefix:\t$prefix\n$dashes"
 echo -e "$final_message\n"