branch: elpa/caml
commit 7eec9fbc49a7f0880a3d98493e5afc98366b58d9
Author: Christophe Troestler <christophe.troest...@umons.ac.be>
Commit: Christophe Troestler <christophe.troest...@umons.ac.be>
Makefile: replace DIST_DIR with DIST_NAME
---
Makefile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index b10ea1f..688327e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,7 @@ VERSION = $(shell grep "^;; *Version" caml.el \
| sed -e 's/;; *Version: *\([^ \t]*\)/\1/')
DESCRIPTION = $(shell grep ';;; caml.el ---' caml.el \
| sed 's/[^-]*--- *\(.*\)/\1/')
-DIST_DIR = caml-mode-$(VERSION)
-OPAM_DIR = caml-mode.$(VERSION)
+DIST_NAME = caml-mode-$(VERSION)
TARBALL = caml-mode-$(VERSION).tgz
OPAM_FILE = packages/caml-mode/caml-mode.$(VERSION)/opam
@@ -104,12 +103,12 @@ install-ocamltags: ocamltags
$(INSTALL_DATA) ocamltags $(SCRIPTDIR)/ocamltags
$(TARBALL): $(DIST_FILES)
- mkdir -p $(DIST_DIR)
- for f in $(DIST_FILES); do cp $$f $(DIST_DIR); done
+ $(INSTALL_MKDIR) $(DIST_NAME)
+ for f in $(DIST_FILES); do cp $$f $(DIST_NAME); done
echo "(define-package \"caml\" \"$(VERSION)\" \"$(DESCRIPTION)\" \
- )" > $(DIST_DIR)/caml-pkg.el
- tar acvf $@ $(DIST_DIR)
- $(RM) -rf $(DIST_DIR)
+ )" > $(DIST_NAME)/caml-pkg.el
+ tar acvf $@ $(DIST_NAME)
+ $(INSTALL_RM_R) $(DIST_NAME)
# This is for testing purposes
compile-only:
