Skip to content

Commit 5654e9e

Browse files
committed
install: add --emacsdatadir/--enable-emacs-addons options
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 52b3103 commit 5654e9e

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

.hunspell.en.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,3 +1240,4 @@ haveDynamicMPATH
12401240
settarg
12411241
ACTIONs
12421242
arg2
1243+
emacsdatadir

Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,10 @@ ifeq ($(vimaddons),y)
723723
$(INSTALL_DATA) share/vim/ftplugin/modulefile.vim '$(DESTDIR)$(vimdatadir)/ftplugin'
724724
$(INSTALL_DATA) share/vim/syntax/modulefile.vim '$(DESTDIR)$(vimdatadir)/syntax'
725725
endif
726+
ifeq ($(emacsaddons),y)
727+
$(INSTALL_DIR) '$(DESTDIR)$(emacsdatadir)'
728+
$(INSTALL_DATA) share/emacs/lisp/modulefile-mode.el* '$(DESTDIR)$(emacsdatadir)'
729+
endif
726730
ifeq ($(nagelfaraddons),y)
727731
$(INSTALL_DIR) '$(DESTDIR)$(nagelfardatadir)'
728732
$(INSTALL_DATA) share/nagelfar/plugin_modulecache.tcl '$(DESTDIR)$(nagelfardatadir)/'
@@ -769,6 +773,11 @@ ifeq ($(vimaddons),y)
769773
-rmdir '$(DESTDIR)$(vimdatadir)/syntax'
770774
-rmdir -p '$(DESTDIR)$(vimdatadir)'
771775
endif
776+
ifeq ($(emacsaddons),y)
777+
rm -f '$(DESTDIR)$(emacsdatadir)/modulefile-mode.el'
778+
rm -f '$(DESTDIR)$(emacsdatadir)/modulefile-mode.elc'
779+
-rmdir -p '$(DESTDIR)$(emacsdatadir)'
780+
endif
772781
ifeq ($(nagelfaraddons),y)
773782
rm -f '$(DESTDIR)$(nagelfardatadir)/plugin_modulecache.tcl'
774783
rm -f '$(DESTDIR)$(nagelfardatadir)/plugin_modulefile.tcl'

Makefile.inc.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ datarootdir := @datarootdir@
1414
mandir := @mandir@
1515
docdir := @docdir@
1616
vimdatadir := @vimdatadir@
17+
emacsdatadir := @emacsdatadir@
1718
nagelfardatadir := @nagelfardatadir@
1819
moduleshome := @moduleshome@
1920

@@ -52,6 +53,7 @@ appendbinpath := @appendbinpath@
5253
setmodulespath := @setmodulespath@
5354
docinstall := @docinstall@
5455
vimaddons := @vimaddons@
56+
emacsaddons := @emacsaddons@
5557
examplemodulefiles := @examplemodulefiles@
5658

5759
# where to install init config files

configure

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ tagcolorname mcookieversioncheck availoutput availterseoutput listoutput \
4040
listterseoutput editor variantshortcut bashcompletiondir fishcompletiondir \
4141
zshcompletiondir tcllinter tcllinteropts nagelfardatadir nagelfaraddons \
4242
stickypurge uniquenameloaded abortonerror sourcecache logger loggeropts \
43-
loggedevents conflictunload spideroutput spiderterseoutput spiderindepth"
43+
loggedevents conflictunload spideroutput spiderterseoutput spiderindepth \
44+
emacsdatadir emacsaddons"
4445
libarglist=()
4546

4647
# flags to know if argument has been specified on command-line
@@ -56,6 +57,7 @@ appendbinpath=n
5657
setmodulespath=n
5758
docinstall=y
5859
vimaddons=y
60+
emacsaddons=y
5961
examplemodulefiles=y
6062
libtclenvmodules=y
6163
SHLIB_SUFFIX='.so'
@@ -119,6 +121,7 @@ datarootdir=
119121
mandir=
120122
docdir=
121123
vimdatadir=
124+
emacsdatadir=
122125
nagelfardatadir=
123126
modulefilesdir=
124127
moduleshome=
@@ -224,6 +227,7 @@ Fine tuning of the installation directories:
224227
--mandir=DIR man documentation [DATAROOTDIR/man]
225228
--docdir=DIR documentation root [DATAROOTDIR/doc]
226229
--vimdatadir=DIR Vim addons directory [DATAROOTDIR/vim/vimfiles]
230+
--emacsdatadir=DIR Emacs addons directory [DATAROOTDIR/emacs/lisp]
227231
--nagelfardatadir=DIR Nagelfar addons directory [DATAROOTDIR/nagelfar]
228232
--modulefilesdir=DIR system modulefiles [PREFIX/modulefiles]
229233
@@ -244,6 +248,8 @@ Optional Features:
244248
man pages installation) [yes]
245249
--enable-vim-addons install Vim addon files in the directory defined
246250
with \'vimdatadir' [yes]
251+
--enable-emacs-addons install Emacs addon files in the directory defined
252+
with \'emacsdatadir' [yes]
247253
--enable-nagelfar-addons
248254
install Nagelfar addon files in the directory
249255
defined with \'nagelfardatadir' [yes]
@@ -508,6 +514,8 @@ placed in the following directory structure:
508514
libexec/
509515
share/
510516
doc/
517+
emacs/
518+
lisp/
511519
man/
512520
man1/
513521
man5/
@@ -686,6 +694,10 @@ for arg in "$@"; do
686694
vimdatadir="${arg#*=}" ;;
687695
--vimdatadir)
688696
nextargisval=vimdatadir ;;
697+
--emacsdatadir=*)
698+
emacsdatadir="${arg#*=}" ;;
699+
--emacsdatadir)
700+
nextargisval=emacsdatadir ;;
689701
--nagelfardatadir=*)
690702
nagelfardatadir="${arg#*=}" ;;
691703
--nagelfardatadir)
@@ -714,6 +726,9 @@ for arg in "$@"; do
714726
--enable-vim-addons*|--disable-vim-addons)
715727
# shellcheck disable=SC2034
716728
vimaddons=$(get_feature_value "$arg") ;;
729+
--enable-emacs-addons*|--disable-emacs-addons)
730+
# shellcheck disable=SC2034
731+
emacsaddons=$(get_feature_value "$arg") ;;
717732
--enable-nagelfar-addons*|--disable-nagelfar-addons)
718733
# shellcheck disable=SC2034
719734
nagelfaraddons=$(get_feature_value "$arg") ;;
@@ -1169,6 +1184,7 @@ fi
11691184
[ -z "$mandir" ] && mandir=$datarootdir/man
11701185
[ -z "$docdir" ] && docdir=$datarootdir/doc
11711186
[ -z "$vimdatadir" ] && vimdatadir=$datarootdir/vim/vimfiles
1187+
[ -z "$emacsdatadir" ] && emacsdatadir=$datarootdir/emacs/lisp
11721188
[ -z "$nagelfardatadir" ] && nagelfardatadir=$datarootdir/nagelfar
11731189
[ -z "$modulefilesdir" ] && modulefilesdir=$prefix/modulefiles
11741190
[ -z "$moduleshome" ] && moduleshome=$prefix

0 commit comments

Comments
 (0)