Author: tom
Date: Mon Sep 29 13:36:05 2008
New Revision: 3015
URL: http://svn.slimdevices.com?rev=3015&root=Jive&view=rev
Log:
Ignore rm failure
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3015&root=Jive&r1=3014&r2=3015&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Mon Sep 29 13:36:05 2008
@@ -106,7 +106,7 @@
##following image creation model basd on sc buildme.pl (might avoid
build system hang on hdiutil cmd
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
- rm $(DMG_TMP_IMAGE_FILENAME)
+ -rm $(DMG_TMP_IMAGE_FILENAME)
mkdir -p $(DMG_TEMP_DIR)
-hdiutil detach "/Volumes/$(DMG_IMAGE_DIR)"
hdiutil create -fs HFS+ -volname "$(DMG_IMAGE_DIR)" -size 100m
"$(DMG_TEMP_DIR)"
@@ -116,7 +116,7 @@
hdiutil convert -ov -format UDZO "$(DMG_TMP_IMAGE_FILENAME)" -o
"$(DMG_IMAGE_FILENAME)"
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
- rm $(DMG_TMP_IMAGE_FILENAME)
+ -rm $(DMG_TMP_IMAGE_FILENAME)
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3015&root=Jive&r1=3014&r2=3015&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in Mon Sep 29 13:36:05 2008
@@ -2535,7 +2535,7 @@
SqueezePlay_dmg: SqueezePlay_bundle
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
- rm $(DMG_TMP_IMAGE_FILENAME)
+ -rm $(DMG_TMP_IMAGE_FILENAME)
mkdir -p $(DMG_TEMP_DIR)
-hdiutil detach "/Volumes/$(DMG_IMAGE_DIR)"
hdiutil create -fs HFS+ -volname "$(DMG_IMAGE_DIR)" -size 100m
"$(DMG_TEMP_DIR)"
@@ -2545,7 +2545,7 @@
hdiutil convert -ov -format UDZO "$(DMG_TMP_IMAGE_FILENAME)" -o
"$(DMG_IMAGE_FILENAME)"
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
- rm $(DMG_TMP_IMAGE_FILENAME)
+ -rm $(DMG_TMP_IMAGE_FILENAME)
src/version.h: FORCE
@echo '/* This file is automatically generated */' > src/version.h
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
