--- a/Make.proto Sun Oct 14 14:37:43 2018 +0200
+++ b/Make.proto Sun Oct 14 14:39:38 2018 +0200
@@ -327,7 +327,7 @@
@-rm -f pers* pers2 data data2 data.boss tetris.scores
cleanlinks:
- @-rm -rf source bitmaps binaries resources examples include
+ @-rm -rf source bitmaps binaries $(RESOURCES) examples include
#
# clean out all that is not needed to run smalltalk
@@ -353,7 +353,7 @@
clobber::
@$(MAKE) removeLinkLibs
@-rm -f modulList.stc modulList.c modulList.o
- @-rm -rf resources source bitmaps include examples lib
+ @-rm -rf $(RESOURCES) source bitmaps include examples lib
@-rm -f stx st.img st.img.sav st.sav
@-rm -f main.o
@-rm -rf modules
@@ -425,8 +425,8 @@
-mkdir "$(DMG_TMP)"/stx.app
-mkdir "$(DMG_TMP)"/stx.app/Contents
-mkdir "$(DMG_TMP)"/stx.app/Contents/Resources
- cp deploySupport/osx_Info.plist "$(DMG_TMP)"/stx.app/Contents/Info.plist
- cp "deploySupport/stx.icns" "$(DMG_TMP)"/stx.app/Contents/Resources/
+ cp osx/osx_Info.plist "$(DMG_TMP)"/stx.app/Contents/Info.plist
+ cp "osx/stx.icns" "$(DMG_TMP)"/stx.app/Contents/Resources/
-mkdir "$(DMG_TMP)"/stx.app/Contents/MacOS
$(MAKE) dmgSTXPackages
$(MAKE) dmgBINContents
@@ -445,7 +445,7 @@
hdiutil attach -readwrite -noverify /tmp/stx.dmg
@-sync
@-sleep 3
- @-(cat deploySupport/osx_osascript.script | osascript)
+ @-(cat osx/osx_osascript.script | osascript)
hdiutil detach /Volumes/stx
@-sync
@@ -461,7 +461,7 @@
# (cd "$(DMG_TMP)"/stx.app/Contents/MacOS ; ln -s ../../Packages/stx/projects/smalltalk/patches .)
# (cd "$(DMG_TMP)"/stx.app/Contents/MacOS ; ln -s ../../Packages/stx/projects/smalltalk/stxPatches .)
# (cd "$(DMG_TMP)"/stx.app/Contents/MacOS ; ln -s ../../Packages/stx/projects/smalltalk/rc.d .)
-# -cp -r resources "$(DMG_TMP)"/stx.app/Contents/MacOS/.
+# -cp -r $(RESOURCES) "$(DMG_TMP)"/stx.app/Contents/MacOS/.
#
# sources and all other package stuff
@@ -532,7 +532,7 @@
rm -rf SmalltalkX$(VSN)_pkg
pkgutil --expand SmalltalkX$(VSN).pkg SmalltalkX$(VSN)_pkg
cp SmalltalkX$(VSN)_pkg/Distribution Distribution.extracted
- cp deploySupport/osx_Distribution SmalltalkX$(VSN)_pkg/Distribution
+ cp osx/osx_Distribution SmalltalkX$(VSN)_pkg/Distribution
mkdir SmalltalkX$(VSN)_pkg/Resources
mkdir SmalltalkX$(VSN)_pkg/Resources/en.lproj
mkdir SmalltalkX$(VSN)_pkg/Resources/de.lproj