Skip to content

Commit

Permalink
Changed default tar program to GNU tar
Browse files Browse the repository at this point in the history
This fixes the issue described in:
https://lists.gnu.org/archive/html/emacs-devel/2020-01/msg00517.html

Also this will allow reproduce the issue described in:
#5
  • Loading branch information
sergeyklay committed Jan 18, 2020
1 parent 7c7bd91 commit 309f05a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
EMACS ?= emacs
CASK ?= cask
PANDOC ?= pandoc
TAR ?= COPYFILE_DISABLE=1 bsdtar
TAR ?= tar

EMACSFLAGS ?=
TESTFLAGS ?= --reporter ert+duration
Expand Down Expand Up @@ -89,7 +89,7 @@ $(ARCHIVE_NAME)-pkg.el: $(ARCHIVE_NAME).el
$(CASK) pkg-file

$(PACKAGE_NAME).tar: README ChangeLog LICENSE $(ARCHIVE_NAME).el $(ARCHIVE_NAME)-pkg.el $(ARCHIVE_NAME).info dir
$(TAR) -c -s "@^@$(PACKAGE_NAME)/@" -f $(PACKAGE_NAME).tar $^
$(TAR) -c -v -f $(PACKAGE_NAME).tar --transform "s@^@$(PACKAGE_NAME)/@" $^

# Public targets

Expand Down Expand Up @@ -122,7 +122,8 @@ package: $(PACKAGE_NAME).tar

.PHONY: install
install: $(PACKAGE_NAME).tar
$(EMACS) --batch -l package -f package-initialize --eval "(package-install-file \"$(PWD)/$(PACKAGE_NAME).tar\")"
$(EMACS) --batch -l package -f package-initialize --eval \
"(let ((debug-on-error t))(package-install-file \"$(PWD)/$(PACKAGE_NAME).tar\"))"

.PHONY: help
help: .title
Expand Down

0 comments on commit 309f05a

Please sign in to comment.