X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FMakefile;h=0d8160498ca3e23292a3717f88db6bf3ad25a327;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=03fc9899a522387620ec083c5f09087f6c5589d7;hpb=f0261d8acab611f3433160e4f07367b870439739;p=xscreensaver

diff --git a/OSX/Makefile b/OSX/Makefile
index 03fc9899..0d816049 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,13 +1,14 @@
 # XScreenSaver for MacOS X, Copyright (c) 2006 by Jamie Zawinski.
 
 XCODE_TARGET = "All Savers"
+XCODEBUILD=xcodebuild
 
 default: release
 all: debug release
 
 clean:
 	-rm -rf build
-#	cd ..; xcodebuild -target $(XCODE_TARGET) clean
+#	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) clean
 
 distclean:
 	-rm -f config.status config.cache config.log \
@@ -18,10 +19,10 @@ distclean:
 distdepend:: update_plist_version
 
 debug: distdepend
-	cd ..; xcodebuild -target $(XCODE_TARGET) -configuration Debug   build
+	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Debug   build
 
 release:: distdepend
-	cd ..; xcodebuild -target $(XCODE_TARGET) -configuration Release build
+	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Release build
 
 release:: check_versions
 
@@ -90,6 +91,7 @@ dmg:: distdepend check_versions
   V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ;		      \
   TMPDIR="build" ;							      \
   SRC="build/Release" ;							      \
+  EXTRAS=../../xdaliclock/OSX/build/Release/*.saver ;			      \
   BASE="xscreensaver-$$V" ;						      \
   OUTDIR="../archive" ;							      \
   DMG="$$OUTDIR/$$BASE.dmg" ;						      \
@@ -108,7 +110,7 @@ dmg:: distdepend check_versions
      's/\\\\\\n//g; m/^RETIRED_GL_EXES\s*=\s*(.*)$$/m && print "$$1\n"'	      \
       ../hacks/glx/Makefile.in` ;					      \
 									      \
-  for f in $$SRC/*.saver ; do						      \
+  for f in $$SRC/*.saver $$EXTRAS ; do					      \
    ok=yes ;								      \
    ff=`echo $$f | perl -e '$$_=<>; s@^.*/(.*)\..*$$@\L$$1@; print'`;	      \
    for r in $$retired ; do						      \
@@ -127,6 +129,7 @@ dmg:: distdepend check_versions
   cp -p XScreenSaverDMG.icns "$$STAGE/.VolumeIcon.icns" ;		      \
   /Developer/Tools/SetFile -a C "$$STAGE" ;				      \
   /Developer/Tools/SetFile -a E "$$STAGE/ READ ME.rtf" ;		      \
+  seticon -d ../../xdaliclock/OSX/daliclockSaver.icns $$STAGE/DaliClock.saver;\
   hdiutil makehybrid -quiet -ov -hfs -hfs-volume-name "$$VOLNAME"	      \
     -hfs-openfolder "$$STAGE" "$$STAGE" -o "$$TMPDMG" ;			      \
   rm -rf "$$STAGE" ;							      \