X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FMakefile;h=2353dc160094a7d347f8a5ffadb4dc6b40e2615c;hb=50be9bb40dc60130c99ffa568e6677779904ff70;hp=c1ad1fb7c995163f778f7745c6f057278525fb00;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;p=xscreensaver

diff --git a/OSX/Makefile b/OSX/Makefile
index c1ad1fb7..2353dc16 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -90,6 +90,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" ;						      \
@@ -103,10 +104,12 @@ dmg:: distdepend check_versions
 									      \
   retired=`perl -0 -ne							      \
      's/\\\\\\n//g; m/^RETIRED_EXES\s*=\s*(.*)$$/m && print "$$1\n"'	      \
-      ../hacks/Makefile.in						      \
+      ../hacks/Makefile.in ;						      \
+      perl -0 -ne							      \
+     '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						      \
@@ -125,6 +128,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" ;							      \