[Scummvm-cvs-logs] CVS: scummvm Makefile,1.60,1.61

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8381

Modified Files:
	Makefile 
Log Message:
Removed 'builddir' again (not really needed for now); fixed 'bundle' rule for external build dirs

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile	30 Jan 2004 21:54:27 -0000	1.60
+++ Makefile	31 Jan 2004 00:05:08 -0000	1.61
@@ -16,7 +16,6 @@
 #######################################################################
 
 srcdir      ?= .
-builddir    ?= .
 
 DEFINES     := -DHAVE_CONFIG_H
 LDFLAGS     :=
@@ -30,7 +29,7 @@
 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 @@
 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 @@
 	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