Skip to content

Commit

Permalink
make zip instead of dmg on mac
Browse files Browse the repository at this point in the history
  • Loading branch information
andreer committed Jul 27, 2010
1 parent ad15a64 commit 4bca48e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 136 deletions.
18 changes: 4 additions & 14 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ $(LISPBOX_HOME)-source.tar.gz:
cp GNUmakefile.slime $(prefix)
cp GNUmakefile.vars $(prefix)
cp Info.plist $(prefix)
cp OSXpackage.mk $(prefix)
cp OSXdiskImage.mk $(prefix)
cp README $(prefix)
cp README.source $(prefix)
cp write-lispbox-el.sh $(prefix)
Expand Down Expand Up @@ -136,25 +134,17 @@ $(distro): lispbox
(cd $(TOP); tar czf - $(LISPBOX_HOME)) > $@
endif

#ifeq ($(os),Darwin)
#distro_with_emacs := LispboxInstaller-$(LISPBOX_VERSION)-with-$(lisp).dmg
#distro_no_emacs := LispboxInstallerNoEmacs-$(LISPBOX_VERSION)-with-$(lisp).dmg
#distro_just_lisp := LispboxInstallerJustLisp-$(LISPBOX_VERSION)-$(lisp).dmg

ifeq ($(os),Darwin)
distro_with_emacs := Lispbox-$(LISPBOX_VERSION)-with-$(lisp).dmg
distro_no_emacs := LispboxNoEmacs-$(LISPBOX_VERSION)-with-$(lisp).dmg
distro_just_lisp := LispboxJustLisp-$(LISPBOX_VERSION)-$(lisp).dmg
distro_with_emacs := Lispbox-$(LISPBOX_VERSION)-with-$(lisp).zip
distro_no_emacs := LispboxNoEmacs-$(LISPBOX_VERSION)-with-$(lisp).zip
distro_just_lisp := LispboxJustLisp-$(LISPBOX_VERSION)-$(lisp).zip

distro := $(if $(JUST_LISP),$(distro_just_lisp),$(if $(NO_EMACS),$(distro_no_emacs),$(distro_with_emacs)))

distro: $(distro)

#$(distro): lispbox
# $(MAKE) -f OSXpackage.mk clean all NAME=$(distro) LISPBOX_VERSION=$(LISPBOX_VERSION) LISPBOX_LISP=$(lisp)

$(distro): lispbox
$(MAKE) -f OSXdiskImage.mk clean all NAME=$(distro) LISPBOX_VERSION=$(LISPBOX_VERSION) LISPBOX_LISP=$(lisp)
(cd $(TOP); zip --recurse-paths - $(LISPBOX_HOME)) > $@

endif

Expand Down
32 changes: 0 additions & 32 deletions OSXdiskImage.mk

This file was deleted.

90 changes: 0 additions & 90 deletions OSXpackage.mk

This file was deleted.

0 comments on commit 4bca48e

Please sign in to comment.