From: Glenn Morris Date: Mon, 21 May 2012 07:30:23 +0000 (-0700) Subject: Rename LEIM_INSTALLDIR to leimdir, treat consistently with lispdir X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~42 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d71dfe75556b7bb4534bfaca0b7cf6cef563961e;p=emacs.git Rename LEIM_INSTALLDIR to leimdir, treat consistently with lispdir * configure.in (LEIM_INSTALLDIR): Rename to leimdir, treat like lispdir. * leim/Makefile.in (install_prefix): Remove. (LEIM_INSTALLDIR): Rename to leimdir. (install): Update for this change. --- diff --git a/ChangeLog b/ChangeLog index f95549d66a3..e9b2a917766 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * configure.in (LEIM_INSTALLDIR): + Rename to leimdir, treat like lispdir. + 2012-05-21 Paul Eggert Make merging from gnulib a script, not a makefile action. diff --git a/configure.in b/configure.in index 87c9a6cd276..ab11b9d6431 100644 --- a/configure.in +++ b/configure.in @@ -37,6 +37,7 @@ dnl hence the single quotes. This is per the GNU coding standards, see dnl (autoconf) Installation Directory Variables dnl See also epaths.h below. lispdir='${datadir}/emacs/${version}/lisp' +leimdir='${datadir}/emacs/${version}/leim' locallisppath='${datadir}/emacs/${version}/site-lisp:'\ '${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim' @@ -1572,7 +1573,6 @@ fi AC_SUBST(TEMACS_LDFLAGS2) INSTALL_ARCH_INDEP_EXTRA=install-etc -LEIM_INSTALLDIR="\${install_prefix}/leim" ns_self_contained=no ns_frag=/dev/null NS_OBJ= @@ -1599,7 +1599,7 @@ if test "${HAVE_NS}" = yes; then infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" - LEIM_INSTALLDIR="\${ns_appresdir}/leim" + leimdir="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= fi ns_frag=$srcdir/src/ns.mk @@ -1609,7 +1609,6 @@ fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" AC_SUBST(INSTALL_ARCH_INDEP_EXTRA) -AC_SUBST(LEIM_INSTALLDIR) AC_SUBST(ns_self_contained) AC_SUBST(NS_OBJ) AC_SUBST(NS_OBJC_OBJ) @@ -3222,6 +3221,7 @@ AC_SUBST(libexecdir) AC_SUBST(mandir) AC_SUBST(infodir) AC_SUBST(lispdir) +AC_SUBST(leimdir) AC_SUBST(locallisppath) AC_SUBST(lisppath) AC_SUBST(x_default_search_path) diff --git a/leim/ChangeLog b/leim/ChangeLog index b2fa25b2d2e..953e6f1acdd 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,5 +1,9 @@ 2012-05-21 Glenn Morris + * Makefile.in (install_prefix): Remove. + (LEIM_INSTALLDIR): Rename to leimdir. + (install): Update for this change. + * Makefile.in (leim-list.el, install): Scrap superfluous subshells. 2012-05-12 Glenn Morris diff --git a/leim/Makefile.in b/leim/Makefile.in index 2e488197b2a..73aa8328ed9 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -34,12 +34,10 @@ datadir=@datadir@ srcdir=@srcdir@ ns_appresdir=@ns_appresdir@ -install_prefix=$(DESTDIR)${datadir}/emacs/${version} - # Where to install LEIM files. -# For most builds, this is ${install_prefix}/leim. +# For most builds, this is ${datadir}/emacs/${version}/leim. # For self-contained ns builds, it is ${ns_appresdir}/leim. -LEIM_INSTALLDIR=@LEIM_INSTALLDIR@ +leimdir=@leimdir@ MKDIR_P = @MKDIR_P@ @@ -190,42 +188,42 @@ compile-main: ${TIT_MISC} done install: all - umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR} - if [ x`cd ${LEIM_INSTALLDIR} && /bin/pwd` != x`/bin/pwd` ] ; then \ - rm -f ${LEIM_INSTALLDIR}/leim-list.el; \ - rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \ - echo "Copying leim files to ${LEIM_INSTALLDIR} ..." ; \ + umask 022; ${MKDIR_P} $(DESTDIR)${leimdir} + if [ x`cd $(DESTDIR)${leimdir} && /bin/pwd` != x`/bin/pwd` ] ; then \ + rm -f $(DESTDIR)${leimdir}/leim-list.el; \ + rm -rf $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/ja-dic ; \ + echo "Copying leim files to $(DESTDIR)${leimdir} ..." ; \ if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ tar -chf - leim-list.el quail ja-dic \ - | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ + | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ else \ tar -chf - leim-list.el quail \ - | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ + | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ cd ${srcdir}; \ tar -chf - quail/* ja-dic \ - | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ + | (cd $(DESTDIR)${leimdir}; umask 0; tar -xvf - && cat > /dev/null) ;\ fi; \ - rm -f ${LEIM_INSTALLDIR}/.gitignore ${LEIM_INSTALLDIR}/*/.gitignore; \ - rm -f ${LEIM_INSTALLDIR}/.arch-inventory ${LEIM_INSTALLDIR}/*/.arch-inventory; \ - rm -f ${LEIM_INSTALLDIR}/\#* ${LEIM_INSTALLDIR}/*/\#* ; \ - rm -f ${LEIM_INSTALLDIR}/.\#* ${LEIM_INSTALLDIR}/*/.\#* ; \ - rm -f ${LEIM_INSTALLDIR}/*~ ${LEIM_INSTALLDIR}/*/*~ ; \ - rm -f ${LEIM_INSTALLDIR}/*.orig ${LEIM_INSTALLDIR}/*/*.orig ; \ + rm -f $(DESTDIR)${leimdir}/.gitignore $(DESTDIR)${leimdir}/*/.gitignore; \ + rm -f $(DESTDIR)${leimdir}/.arch-inventory $(DESTDIR)${leimdir}/*/.arch-inventory; \ + rm -f $(DESTDIR)${leimdir}/\#* $(DESTDIR)${leimdir}/*/\#* ; \ + rm -f $(DESTDIR)${leimdir}/.\#* $(DESTDIR)${leimdir}/*/.\#* ; \ + rm -f $(DESTDIR)${leimdir}/*~ $(DESTDIR)${leimdir}/*/*~ ; \ + rm -f $(DESTDIR)${leimdir}/*.orig $(DESTDIR)${leimdir}/*/*.orig ; \ else true; fi -unset CDPATH; \ if [ -n "${GZIP_PROG}" ]; \ then \ echo "Compressing *.el ..." ; \ - (cd ${LEIM_INSTALLDIR}; for f in `find . -name "*.elc" -print`; do \ + (cd $(DESTDIR)${leimdir}; for f in `find . -name "*.elc" -print`; do \ ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ done) \ else true; fi - -chmod -R a+r ${LEIM_INSTALLDIR} + -chmod -R a+r $(DESTDIR)${leimdir} for installuser in $${LOGNAME} $${USERNAME} $${USER} \ `id -un 2> /dev/null`; do \ [ -n "$${installuser}" ] && break ; \ done ; \ - find ${LEIM_INSTALLDIR} -exec chown $${installuser} '{}' ';' + find $(DESTDIR)${leimdir} -exec chown $${installuser} '{}' ';' clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \