procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Copy README.W32 when installing Windows build (bug#14757).

Browse source 
* Makefile.in (install-nt): Also pass datadir.

* nt/Makefile.in (datarootdir, datadir, INSTALL_DATA): Declare.
(install): Copy README.W32 to $(datadir)/emacs/$(version).
(uninstall): Remove README.W32.
This commit is contained in:
Juanma Barranquero 2014-02-13 04:19:57 +01:00
parent 0dab5068ae
commit 1a4c95f664
4 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2014-02-13 Juanma Barranquero <lekktu@gmail.com>
* Makefile.in (install-nt): Also pass datadir.
2014-02-05 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:

1
Makefile.in
View file

@ -510,6 +510,7 @@ install-nt:
$(MAKE) install $(MFLAGS) prefix="${prefix}" \
exec_prefix="${exec_prefix}" bindir="${bindir}" \
libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
datadir="${datadir}" \
INSTALL_STRIP=${INSTALL_STRIP}
## In the share directory, we are deleting:

6
nt/ChangeLog
View file

@ -1,3 +1,9 @@
2014-02-13 Juanma Barranquero <lekktu@gmail.com>
* Makefile.in (datarootdir, datadir, INSTALL_DATA): Declare.
(install): Copy README.W32 to $(datadir)/emacs/$(version).
(uninstall): Remove README.W32. (Bug#14757)
2014-02-08 Eli Zaretskii <eliz@gnu.org>
* INSTALL: Update for Emacs 24.4.

12
nt/Makefile.in
View file

@ -56,6 +56,15 @@ exec_prefix=@exec_prefix@
# to `../configure'.
bindir=@bindir@
# The root of the directory tree for read-only architecture-independent
# data files. ${datadir}, ${infodir} and ${mandir} are based on this.
datarootdir=@datarootdir@
# Where to install architecture-independent data files. ${lispdir}
# and ${etcdir} are subdirectories of this. This is set with the
# --datadir option to `../configure'.
datadir=@datadir@
# Where to install and expect executable files to be run by Emacs
# rather than directly by users, and other architecture-dependent
# data. ${archlibdir} is usually below this. This is set with the
@ -95,6 +104,7 @@ archlibdir=@archlibdir@
# ../configure figures out the correct values for these.
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
# By default, we uphold the dignity of our programs.
@ -161,8 +171,10 @@ install: $(DESTDIR)${archlibdir}
for file in ${INSTALLABLES} ; do \
$(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
done
$(INSTALL_DATA) README.W32 "$(DESTDIR)${datadir}/emacs/$(version)"
uninstall:
rm -f "$(DESTDIR)${datadir}/emacs/$(version)/README.W32"
for file in ${INSTALLABLES}; do \
rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
done