aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMax Horn2004-01-31 00:05:08 +0000
committerMax Horn2004-01-31 00:05:08 +0000
commit42a3206e6fbfe9cdb879053b4e965cb82f24c36c (patch)
tree5974cd20b7aa3e01e2cf2c3d2230a303cafbd75b /Makefile
parent9dda30c30859696538bc22dc85b31a7365acbdb7 (diff)
downloadscummvm-rg350-42a3206e6fbfe9cdb879053b4e965cb82f24c36c.tar.gz
scummvm-rg350-42a3206e6fbfe9cdb879053b4e965cb82f24c36c.tar.bz2
scummvm-rg350-42a3206e6fbfe9cdb879053b4e965cb82f24c36c.zip
Removed 'builddir' again (not really needed for now); fixed 'bundle' rule for external build dirs
svn-id: r12683
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 926d73ca92..32974918c7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ CP := cp
#######################################################################
srcdir ?= .
-builddir ?= .
DEFINES := -DHAVE_CONFIG_H
LDFLAGS :=
@@ -30,7 +29,7 @@ MODULE_DIRS :=
EXECUTABLE := scummvm$(EXEEXT)
# Load the make rules generated by configure
-include $(builddir)/config.mak
+include config.mak
# Uncomment this for stricter compile time code verification
# CXXFLAGS+= -Werror
@@ -50,7 +49,7 @@ CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new -Wctor-dtor-privacy
include $(srcdir)/Makefile.common
# check if configure has been run or has been changed since last run
-$(builddir)/config.mak: $(srcdir)/configure
+config.mak: $(srcdir)/configure
@echo "You need to run ./configure before you can run make"
@echo "Either you haven't run it before or it has changed."
@echo "If you cannot run configure, use 'make -f Makefile.noconf'"
@@ -90,9 +89,9 @@ bundle: scummvm-static
mkdir -p $(bundle_name)/Contents/MacOS
mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
- cp Info.plist $(bundle_name)/Contents/
- cp scummvm.icns $(bundle_name)/Contents/Resources/
- cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
+ cp $(srcdir)/Info.plist $(bundle_name)/Contents/
+ cp $(srcdir)/scummvm.icns $(bundle_name)/Contents/Resources/
+ cp $(srcdir)/scummvm-static $(bundle_name)/Contents/MacOS/scummvm
strip $(bundle_name)/Contents/MacOS/scummvm
# Special target to create a static linked binary for Mac OS X