From a92d9807237a024106b67f045822679f7ee4df54 Mon Sep 17 00:00:00 2001 From: tobigun Date: Sat, 14 Mar 2009 21:18:50 +0000 Subject: merge with current trunk (just update) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1634 b956fd51-792f-4845-bead-9b4dfca2ff2c --- unicode/Makefile.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'unicode/Makefile.in') diff --git a/unicode/Makefile.in b/unicode/Makefile.in index 7dd84313..ad94259d 100644 --- a/unicode/Makefile.in +++ b/unicode/Makefile.in @@ -182,7 +182,7 @@ Makefile: $(srcdir)/Makefile.in $(USDX_SRC_DIR)/Makefile.in $(USDX_SRC_DIR)/conf config.status: configure ./config.status --recheck -.PHONE: reconf +.PHONY: reconf reconf: ./autogen.sh @@ -364,20 +364,21 @@ macosx-app: all @echo "Creating the Mac OS X application" @echo "" - $(MKDIR) $(macosx_bundle_path)/Resources + $(MKDIR) $(macosx_bundle_path) # Put the icon file into its particular place. # Must be done BEFORE info.plist is created. - $(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/Resources/ + $(MKDIR) $(macosx_bundle_path)/resources + $(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/resources/ # the info.plist file $(INSTALL_DATA) $(USDX_SRC_DIR)/macosx/Info.plist $(macosx_bundle_path)/ # Copy the resources. - $(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS + $(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path) bindir=$(macosx_bundle_path)/MacOS # Create the song directory. - $(MKDIR) $(macosx_bundle_path)/Resources/songs + $(MKDIR) $(macosx_bundle_path)/songs # final messages @echo "" @@ -430,7 +431,7 @@ endef .PHONY: macosx-dmg macosx-dmg: macosx-standalone-app $(RM) UltraStarDeluxe.dmg - $(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage + $(HDIUTIL) create -type SPARSE -size 40m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage /bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe # /bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns # /Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe -- cgit v1.2.3