branch: externals/gpr-mode
commit 924bad964550047a4c06405c66a035fa28e1f4d2
Author: Stephen Leake <stephen_le...@stephe-leake.org>
Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Fix header comment style again, improve install.sh
* gpr-mode.el: Really fix header comment style.
* install.sh: Improve.
---
gpr-mode.el | 2 +-
install.sh | 37 ++++++++++++++++---------------------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/gpr-mode.el b/gpr-mode.el
index 00094469a6..a8b5d8fe41 100644
--- a/gpr-mode.el
+++ b/gpr-mode.el
@@ -1,4 +1,4 @@
-;;; gpr-mode --- Major mode for editing GNAT project files -*-
lexical-binding:t -*-
+;;; gpr-mode.el --- Major mode for editing GNAT project files -*-
lexical-binding:t -*-
;; Copyright (C) 2004, 2007, 2008, 2012-2015, 2017 - 2020, 2022 Free Software
Foundation, Inc.
diff --git a/install.sh b/install.sh
index 0f279215ac..2cda816129 100644
--- a/install.sh
+++ b/install.sh
@@ -1,31 +1,26 @@
#!/bin/sh
# Install executables for Gpr mode.
-#
+#
+# $1 : optional --prefix=<dir>
+#
# See build.sh for build (must be run before install).
-if type alr; then
- echo "installing gpr-mode executables via Alire"
+if [ x$1 = x ]; then
+ PREFIX=$HOME/.local
+ # as recommended by
https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+else
+ PREFIX=$1
+fi
+
+echo "installing gpr-mode executables to" $PREFIX/bin
- if [ x$1 == x ]; then
- echo "you must specify the install directory with 'install.sh <dir>'"
- return 1
- fi
- # IMPROVEME: when alr supports install, use that
- cp emacs_gpr_mode*/bin/* $1
+# No need for gprinstall; we only need the executables
-elif type gprbuild; then
- echo "installing gpr-mode executables via gnat compiler"
-
- # $1 : optional --prefix=<dir>
- #
- # If you don't have write permission in the GNAT installation
- # directory, you need to use --prefix=<dir>, or run with root priviledges.
+if type alr; then
+ cp emacs_gpr_mode*/bin/* $PREFIX/bin
- if [ -d ../wisi-4.1.? ]; then
- WISI_DIR=`ls -d ../wisi-4.1.?`
- fi
-
- gprinstall -f -p -P gpr_mode_wisi_parse.gpr -aP $WISI_DIR
--install-name=gpr_mode_wisi_parse $1
+elif type gprbuild; then
+ cp bin/* $PREFIX/bin
else
echo "neither Alire nor gnat compiler found"
