Fix the Makefile (and hopefully the OS X Makefile as well) after the talkfile commit and let talkfile.cpp build on non-Windows. Also fix incorrect meaning of DESTDIR in the Makefile.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13912 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 4 deletions

diff --git a/rbutil/Makefile b/rbutil/Makefile
index 9321ed8ed8..fe3b5b74a1 100644
--- a/rbutil/Makefile
+++ b/rbutil/Makefile
@@ -18,7 +18,7 @@ CXX=$(shell $(PREFIX)wx-config --version=2.8 --cxx)
 INC = `$(PREFIX)wx-config --version=2.8 --cxxflags`
 LIBS = `$(PREFIX)wx-config --version=2.8 --libs`
 CFLAGS= -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE
-OBJS=rbutil.o rbutilApp.o rbutilFrm.o rbutilCtrls.o install_dialogs.o bootloaders.o installlog.o ipodpatcher/ipodpatcher.o sansapatcher/sansapatcher.o irivertools.o md5sum.o autodetection.o
+OBJS=rbutil.o rbutilApp.o rbutilFrm.o rbutilCtrls.o install_dialogs.o bootloaders.o installlog.o ipodpatcher/ipodpatcher.o sansapatcher/sansapatcher.o irivertools.o md5sum.o autodetection.o talkfile.o
 
 ifdef __CYGWIN__
 OBJS+=ipodpatcher/ipodio-win32.o sansapatcher/sansaio-win32.o
@@ -32,9 +32,9 @@ EXTRAOBJS = $(wildcard icons/*.o)
 
 SILENT = @
 
-# Install into /usr/local by default
+# Install with / as root by default
 ifndef DESTDIR
-  DESTDIR=/usr/local
+  DESTDIR=""
 endif
 
 # type "make WIN=1" for a Windows build using the Debian mingw cross-compiler
@@ -75,4 +75,4 @@ clean:
 
 .PHONY: install
 install:
-        install -D rbutil$(EXT) $(DESTDIR)/bin/rbutil$(EXT)
+        install -D rbutil$(EXT) $(DESTDIR)/usr/bin/rbutil$(EXT)