len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13912 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonas Häggqvist 2007-07-15 22:19:24 +00:00
parent 8f3e56e5be
commit 97db2ab9a6
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rbutil/Makefile
View file

@ -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)