diff --git a/Makefile b/Makefile index 1a5fad4abf..3cc3707862 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,9 @@ CC = gcc BINARY = f IMAGE = factor.image BUNDLE = Factor.app -DISK_IMAGE_DIR = Factor-0.84 -DISK_IMAGE = Factor-0.84.dmg +VERSION = 0.84 +DISK_IMAGE_DIR = Factor-$(VERSION) +DISK_IMAGE = Factor-$(VERSION).dmg ifdef DEBUG CFLAGS = -g @@ -104,7 +105,20 @@ macosx.dmg: rm -f $(DISK_IMAGE) rm -rf $(DISK_IMAGE_DIR) mkdir $(DISK_IMAGE_DIR) - cp -R $(BUNDLE) $(DISK_IMAGE_DIR)/$(BUNDLE) + mkdir -p $(DISK_IMAGE_DIR)/Factor/ + cp -R $(BUNDLE) $(DISK_IMAGE_DIR)/Factor/$(BUNDLE) + chmod +x cp_dir + cp factor.image $(DISK_IMAGE_DIR)/Factor/ + find doc library contrib examples fonts \( -name '*.factor' \ + -o -name '*.facts' \ + -o -name '*.txt' \ + -o -name '*.html' \ + -o -name '*.ttf' \ + -o -name '*.el' \ + -o -name '*.vim' \ + -o -name '*.fgen' \ + -o -name '*.js' \) \ + -exec ./cp_dir {} $(DISK_IMAGE_DIR)/Factor/{} \; hdiutil create -srcfolder "$(DISK_IMAGE_DIR)" -fs HFS+ \ -volname "$(DISK_IMAGE_DIR)" "$(DISK_IMAGE)" diff --git a/contrib/factory/README b/contrib/factory/README.txt similarity index 100% rename from contrib/factory/README rename to contrib/factory/README.txt diff --git a/contrib/lambda/lambda.TODO b/contrib/lambda/TODO.txt similarity index 100% rename from contrib/lambda/lambda.TODO rename to contrib/lambda/TODO.txt