[Emacs-diffs] Changes to emacs/Makefile.in

[Juanma Barranquero]

Index: emacs/Makefile.in
diff -c emacs/Makefile.in:1.276 emacs/Makefile.in:1.277
*** emacs/Makefile.in:1.276     Wed Jan 22 12:13:08 2003
--- emacs/Makefile.in   Fri Jan 31 10:07:54 2003
***************
*** 215,222 ****
  TRANSFORM = @program_transform_name@
  
  # What emacs should be called when installed.
! EMACS = `echo emacs | sed '$(TRANSFORM)'`
! EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`
  
  # Subdirectories to make recursively.  `lisp' is not included
  # because the compiled lisp files are part of the distribution.
--- 215,222 ----
  TRANSFORM = @program_transform_name@
  
  # What emacs should be called when installed.
! EMACS = `echo address@hidden@ | sed '$(TRANSFORM)'`
! EMACSFULL = `echo address@hidden@ | sed '$(TRANSFORM)'`
  
  # Subdirectories to make recursively.  `lisp' is not included
  # because the compiled lisp files are part of the distribution.
***************
*** 358,364 ****
            exec_prefix=${exec_prefix} bindir=${bindir} \
            libexecdir=${libexecdir} archlibdir=${archlibdir} \
            INSTALL_STRIP=${INSTALL_STRIP})
!       ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/$(EMACSFULL)
        -chmod 1755  ${bindir}/$(EMACSFULL)
        rm -f ${bindir}/$(EMACS)
        -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
--- 358,364 ----
            exec_prefix=${exec_prefix} bindir=${bindir} \
            libexecdir=${libexecdir} archlibdir=${archlibdir} \
            INSTALL_STRIP=${INSTALL_STRIP})
!       ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/address@hidden@ 
${bindir}/$(EMACSFULL)
        -chmod 1755  ${bindir}/$(EMACSFULL)
        rm -f ${bindir}/$(EMACS)
        -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
***************
*** 406,412 ****
              (cd $${dir}; tar -chf - . ) \
                | (cd $${dest}; umask 022; \
                     tar -xvf - && cat > /dev/null) || exit 1; \
!             find $${dest} -exec chown $$LOGNAME {} ';' ;\
              for subdir in `find $${dest} -type d ! -name RCS ! -name CVS 
-print` ; do \
                chmod a+rx $${subdir} ; \
                rm -rf $${subdir}/RCS ; \
--- 406,412 ----
              (cd $${dir}; tar -chf - . ) \
                | (cd $${dest}; umask 022; \
                     tar -xvf - && cat > /dev/null) || exit 1; \
!             find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {} ';' ;\
              for subdir in `find $${dest} -type d ! -name RCS ! -name CVS 
-print` ; do \
                chmod a+rx $${subdir} ; \
                rm -rf $${subdir}/RCS ; \
***************
*** 445,451 ****
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
           (cd ./etc; tar -chf - DOC*) \
             |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 
1; \
!          (cd $(docdir); chown $${LOGNAME} DOC*; chmod a+r DOC*; \
            if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
        else true; fi
        -unset CDPATH; \
--- 445,451 ----
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
           (cd ./etc; tar -chf - DOC*) \
             |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 
1; \
!          (cd $(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
            if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
        else true; fi
        -unset CDPATH; \
***************
*** 457,463 ****
           echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
           (cd lisp; tar -chf - *.el *.elc) \
             |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 
1; \
!          (cd ${lispdir}; find . -exec chown $${LOGNAME} {} ';') ; \
        else true; fi
        -unset CDPATH; \
        thisdir=`/bin/pwd`; \
--- 457,463 ----
           echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
           (cd lisp; tar -chf - *.el *.elc) \
             |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 
1; \
!          (cd ${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; 
\
        else true; fi
        -unset CDPATH; \
        thisdir=`/bin/pwd`; \
***************
*** 735,741 ****
  bootstrap: bootstrap-clean-before info FRC
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
        (cd src; $(MAKE) $(MFLAGS) bootstrap)
!       (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
        (cd src; $(MAKE) $(MFLAGS) mostlyclean)
        $(MAKE) $(MFLAGS) all
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
--- 735,741 ----
  bootstrap: bootstrap-clean-before info FRC
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
        (cd src; $(MAKE) $(MFLAGS) bootstrap)
!       (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/address@hidden@)
        (cd src; $(MAKE) $(MFLAGS) mostlyclean)
        $(MAKE) $(MFLAGS) all
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)