- distinguish between $(srcdir)/build/macosx, where the source files

are found, and build/macosx, where the files created by configure are
  found.  Now VPATH build should work.
This commit is contained in:
Bryce Denney 2002-09-23 03:58:25 +00:00
parent b9847fe6c1
commit a96d0da728

View File

@ -192,7 +192,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h:
$(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.88 2002-09-23 03:45:11 bdenney Exp $$' >> bxversion.h
echo '// $$Id: Makefile.in,v 1.89 2002-09-23 03:58:25 bdenney Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -449,7 +449,8 @@ dist-clean: local-dist-clean
# Build app on MacOS X
###########################################
APP=bochs.app
MACOSX_STUFF=$(srcdir)/build/macosx
MACOSX_STUFF=build/macosx
MACOSX_STUFF_SRCDIR=$(srcdir)/$(MACOSX_STUFF)
REZ=/Developer/Tools/Rez
RINCLUDES=/System/Library/Frameworks/Carbon.framework/Libraries/RIncludes
REZ_ARGS=-append -i $RINCLUDES -d SystemSevenOrLater=1 -useDF
@ -459,13 +460,13 @@ $(APP)/.build: bochs
$(MKDIR) -p $(APP)
$(MKDIR) -p $(APP)/Contents
$(CP) -f $(MACOSX_STUFF)/Info.plist $(APP)/Contents
$(CP) -f $(MACOSX_STUFF)/pbdevelopment.plist $(APP)/Contents
$(CP) -f $(MACOSX_STUFF_SRCDIR)/pbdevelopment.plist $(APP)/Contents
echo -n "APPL????" > $(APP)/Contents/PkgInfo
$(MKDIR) -p $(APP)/Contents/MacOS
$(CP) bochs $(APP)/Contents/MacOS
$(MKDIR) -p $(APP)/Contents/Resources
$(REZ) $(REZ_ARGS) $(MACOSX_STUFF)/bochs.r -o $(APP)/Contents/Resources/bochs.rsrc
$(CP) -f $(MACOSX_STUFF)/bochs-icn.icns $(APP)/Contents/Resources
$(REZ) $(REZ_ARGS) $(MACOSX_STUFF_SRCDIR)/bochs.r -o $(APP)/Contents/Resources/bochs.rsrc
$(CP) -f $(MACOSX_STUFF_SRCDIR)/bochs-icn.icns $(APP)/Contents/Resources
ls -ld $(APP)
touch $(APP)/.build