Show
Ignore:
Timestamp:
04/16/06 21:46:31 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib-src/Makefile.in

    r4037 r4058  
    286286#ifdef MOVEMAIL_NEEDS_BLESSING 
    287287/* Don\'t charge ahead and do it!  Let the installer decide. 
    288           ./blessmail ${archlibdir}/movemail${EXEEXT}  */ 
     288          ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}  */ 
    289289        @if [ `wc -l <blessmail` != 2 ] ; then \ 
    290290          dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ 
    291291          echo Assuming $$dir is really the mail spool directory, you should; \ 
    292           echo run  lib-src/blessmail ${archlibdir}/movemail${EXEEXT}; \ 
     292          echo run  lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}; \ 
    293293          echo as root, to give  movemail${EXEEXT}  appropriate permissions.; \ 
    294294          echo Do that after running  make install.; \ 
    …… 
    298298/* Install the internal utilities.  Until they are installed, we can 
    299299   just run them directly from lib-src.  */ 
    300 ${archlibdir}: all 
     300$(DESTDIR)${archlibdir}: all 
    301301        @echo 
    302302        @echo "Installing utilities run internally by Emacs." 
    303         $(top_srcdir)/mkinstalldirs ${archlibdir} 
    304         if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \ 
     303        $(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir} 
     304        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \ 
    305305          for file in ${UTILITIES}; do \ 
    306             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \ 
     306            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ 
    307307          done ; \ 
    308308        fi 
    309         $(top_srcdir)/mkinstalldirs ${gamedir} 
    310         touch ${gamedir}/snake-scores 
    311         touch ${gamedir}/tetris-scores 
     309        $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir} 
     310        touch $(DESTDIR)${gamedir}/snake-scores 
     311        touch $(DESTDIR)${gamedir}/tetris-scores 
    312312/* If the following commands fail, that is not a big deal. 
    313313   update-game-score will detect at runtime that it is not setuid, 
    314314   and handle things accordingly. */ 
    315         -if chown ${gameuser} ${archlibdir}/update-game-score && chmod u+s ${archlibdir}/update-game-score; then \ 
    316           chown ${gameuser} ${gamedir}; \ 
    317           chmod u=rwx,g=rwx,o=rx ${gamedir}; \ 
     315        -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ 
     316          chown ${gameuser} $(DESTDIR)${gamedir}; \ 
     317          chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ 
    318318        fi 
    319         if [ `(cd ${archlibdir} && /bin/pwd)` \ 
     319        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \ 
    320320             != `(cd ${srcdir} && /bin/pwd)` ]; then \ 
    321321          for file in ${SCRIPTS}; do \ 
    322             $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \ 
     322            $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \ 
    323323          done ; \ 
    324324        fi 
    325325 
    326 install: ${archlibdir} 
     326install: $(DESTDIR)${archlibdir} 
    327327        @echo 
    328328        @echo "Installing utilities for users to run." 
    329329        for file in ${INSTALLABLES} ; do \ 
    330           $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ 
    331           chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \ 
     330          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ 
     331          chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \ 
    332332        done 
    333333        for file in ${INSTALLABLE_SCRIPTS} ; do \ 
    334           $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \ 
    335           chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \ 
     334          $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \ 
     335          chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \ 
    336336        done 
    337337 
    338338uninstall: 
    339         (cd ${bindir}; \ 
     339        (cd $(DESTDIR)${bindir}; \ 
    340340        for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \ 
    341           rm -f ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ 
     341          rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ 
    342342        done) 
    343         (cd ${archlibdir}; \ 
     343        (cd $(DESTDIR)${archlibdir}; \ 
    344344         rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) 
    345345