1. 21 Oct, 2012 2 commits
    • Glenn Morris's avatar
      Put back old Emacs 22 icons, just don't install them · ad483434
      Glenn Morris authored
      Some people prefer them to the newer icon
      
      * Makefile.in (install-etc): Don't install emacs22 icons.
      
      * etc/images/icons/hicolor/32x32/apps/emacs22.png:
      * etc/images/icons/hicolor/16x16/apps/emacs22.png:
      * etc/images/icons/hicolor/48x48/apps/emacs22.png:
      * etc/images/icons/hicolor/24x24/apps/emacs22.png: Restore old icons.
      
      * etc/images/icons/README: Restore info about emacs22 icons
      ad483434
    • Glenn Morris's avatar
      In Makefile.in, use a make variable rather than a shell variable. · 8dc2a723
      Glenn Morris authored
      * Makefile.in (emacs_transform): New variable.
      (install-etc): Prefer a make variable to a shell variable.
      8dc2a723
  2. 18 Oct, 2012 1 commit
  3. 15 Oct, 2012 2 commits
  4. 29 Sep, 2012 2 commits
  5. 23 Sep, 2012 1 commit
  6. 22 Sep, 2012 1 commit
  7. 17 Sep, 2012 3 commits
  8. 16 Sep, 2012 1 commit
    • Glenn Morris's avatar
      Increase compartmentalization of Nextstep builds rules, · 83da1b55
      Glenn Morris authored
      and store Emacs version number in fewer versioned files.
      
      * configure.ac (ns_appsrc): Use relative names.
      (ns_frag): Remove.
      (Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
      (nextstep/Makefile): Generate these nextstep files.
      (SUBDIR_MAKEFILES): Add nextstep.
      
      * Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
      
      * make-dist (nextstep/templates): Add directory.
      (nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
      (nextstep/Cocoa/Emacs.base/Contents)
      (nextstep/GNUstep/Emacs.base/Resources): Update contents.
      
      * .bzrignore: Add some nextstep files.
      
      * admin/admin.el (set-version): No more need to set nextstep versions.
      (set-copyright): Update for moved nextstep files.
      
      * nextstep/Makefile.in: New file.
      * nextstep/templates: New directory.
      * nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
      * nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
      Move here from various Cocoa/, GNUstep/ locations.
      Let configure set the version number.
      * nextstep/Cocoa/Emacs.base/Contents/Info.plist:
      * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
      * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
      * nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
      * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
      
      * src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
      (ns_frag): Remove.
      (ns-app): Move here from ns.mk, and simplify.
      (clean): Simplify nextstep entry.
      * src/ns.mk: Remove file.
      83da1b55
  9. 11 Sep, 2012 1 commit
    • Glenn Morris's avatar
      Be more explicit about some Makefile dependencies · 9d9edd4b
      Glenn Morris authored
      * Makefile.in (install-arch-dep, install-arch-indep, install-doc):
      Be more explicit about dependencies, for parallel `make install'.
      
      It is not so unreasonable to run `make -j# install' from a clean state
      for a self-contained NS build, where the "installation" happens within
      the build tree.
      9d9edd4b
  10. 10 Sep, 2012 1 commit
    • Paul Eggert's avatar
      Improve robustness of 'make bootstrap'. · b8b0239f
      Paul Eggert authored
      Run autogen.sh after bootstrap-clean, to avoid bzr pull issues.
      * INSTALL, README: Document autogen.sh.
      * Makefile.in (Makefile): Mark it as precious, since it's updated
      atomically.
      (MAKE_CONFIG_STATUS): New macro.
      (config.status, bootstrap): Use it.  This causes 'make bootstrap'
      to run config.status with the --recheck option, which is more
      appropriate for a bootstrap.
      (bootstrap): Run autogen.sh right after cleaning.  Don't worry
      about failures due to missing tools.
      * autogen.sh: Exit with status 101 when failing due to missing tools.
      * make-dist: Distribute autogen.sh.
      
      Fixes: debbugs:12376
      b8b0239f
  11. 22 Aug, 2012 1 commit
  12. 20 Aug, 2012 1 commit
  13. 31 Jul, 2012 1 commit
  14. 30 Jul, 2012 3 commits
  15. 29 Jul, 2012 1 commit
  16. 09 Jul, 2012 1 commit
  17. 30 Jun, 2012 1 commit
    • Glenn Morris's avatar
      Make --no-site-lisp work for --enable-locallisppath elements · ca26824c
      Glenn Morris authored
      without "site-lisp" in the name.
      Ref http://debbugs.gnu.org/10208#25, point iii).
      
      * configure.in (standardlisppath): New output variable.
      (lisppath): Use standardlisppath.
      * Makefile.in (standardlisppath): New, set by configure.
      (epaths-force): Use standardlisppath and locallisppath rather than lisppath.
      
      * src/epaths.in (PATH_SITELOADSEARCH): New.
      * src/lread.c (init_lread): Use PATH_SITELOADSEARCH.
      
      * nt/paths.h (PATH_SITELOADSEARCH): New.
      
      Fixes: debbugs:11658
      ca26824c
  18. 01 Jun, 2012 1 commit
  19. 22 May, 2012 2 commits
  20. 21 May, 2012 4 commits
    • Glenn Morris's avatar
      * update-subdirs: Move to build-aux/. · ff0c3cfb
      Glenn Morris authored
      * make-dist:
      * Makefile.in (install-arch-indep):
      * lisp/Makefile.in (update-subdirs):
      * lisp/makefile.w32-in (update-subdirs-SH):
      Update for this change.
      ff0c3cfb
    • Glenn Morris's avatar
      Let the top-level Makefile install leim · d10cfddd
      Glenn Morris authored
      * Makefile.in (leimdir): New, set by configure.
      (COPYDIR, COPYDESTS): Add leim directories.
      (install-leim): Remove.
      (install-arch-indep): Handle leim installation directly.
      
      * leim/Makefile.in (install): Remove, let top-level do it.
      (version, prefix, datarootdir, datadir, ns_appresdir, leimdir):
      (MKDIR_P, GZIP_PROG): Remove, no longer used.
      d10cfddd
    • Paul Eggert's avatar
      Make merging from gnulib a script, not a makefile action. · 9b4ee616
      Paul Eggert authored
      Putting it in a makefile has some problems with reflection, as
      merging from gnulib updates 'configure', which can update the makefile.
      Putting it in a standalone script breaks this loop.
      * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
      (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
      Remove, moving the actions to the script admin/merge-gnulib.
      * admin/merge-gnulib: New script, with actions moved here from
      ../Makefile.in.
      9b4ee616
    • Glenn Morris's avatar
      Command substitution already runs in a subshell · b847032c
      Glenn Morris authored
      * Makefile.in (install-arch-indep, install-doc, install-info, uninstall):
      * leim/Makefile.in (leim-list.el, install):
      * lib-src/Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
      * lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
      * test/automated/Makefile.in (setwins):
      Scrap superfluous subshells.
      b847032c
  21. 19 May, 2012 9 commits