[Emacs-diffs] trunk r113513: No need for configure to create etc/ and lisp/ any more

[Glenn Morris]

------------------------------------------------------------
revno: 113513
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-23 19:00:43 -0400
message:
  No need for configure to create etc/ and lisp/ any more
  
  * configure.ac (etc, lisp): No need to create specially.
  Configure already creates lisp when generating lisp/Makefile;
  src/Makefile now creates etc when needed.
  
  * src/Makefile.in ($(etc)/DOC, temacs$(EXEEXT)): Ensure etc/ exists.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-07-23 09:06:46 +0000
+++ b/ChangeLog 2013-07-23 23:00:43 +0000
@@ -1,3 +1,8 @@
+2013-07-23  Glenn Morris  <address@hidden>
+
+       * configure.ac (etc, lisp): No need to create specially.
+       Configure already creates lisp, src/Makefile now creates etc.
+
 2013-07-23  Paul Eggert  <address@hidden>
 
        Port to GNU/Linux systems with tinfo but not ncurses.

=== modified file 'configure.ac'
--- a/configure.ac      2013-07-23 08:08:57 +0000
+++ b/configure.ac      2013-07-23 23:00:43 +0000
@@ -4854,13 +4854,6 @@
 
 AC_SUBST(SUBDIR_MAKEFILES_IN)
 
-dnl Make the necessary directories, if they don't exist.
-AC_CONFIG_COMMANDS([mkdirs], [
-for dir in etc lisp ; do
-  test -d ${dir} || mkdir ${dir}
-done
-])
-
 dnl You might wonder (I did) why epaths.h is generated by running make,
 dnl rather than just letting configure generate it from epaths.in.
 dnl One reason is that the various paths are not fully expanded (see above);

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-23 08:08:57 +0000
+++ b/src/ChangeLog     2013-07-23 23:00:43 +0000
@@ -1,3 +1,7 @@
+2013-07-23  Glenn Morris  <address@hidden>
+
+       * Makefile.in ($(etc)/DOC, temacs$(EXEEXT)): Ensure etc/ exists.
+
 2013-07-23  Paul Eggert  <address@hidden>
 
        Port to GNU/Linux systems with tinfo but not ncurses.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2013-07-23 22:55:38 +0000
+++ b/src/Makefile.in   2013-07-23 23:00:43 +0000
@@ -469,6 +469,7 @@
 ## in the contents of the DOC file.
 ##
 $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
+       $(MKDIR_P) $(etc)
        -rm -f $(etc)/DOC
        $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > 
$(etc)/DOC
        $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| 
\\\\||' -e 's|^[   ]*$$(lispsource)/||p' $(srcdir)/lisp.mk`
@@ -497,10 +498,15 @@
 $(lib)/libgnu.a: $(config_h)
        cd $(lib) && $(MAKE) libgnu.a
 
+## We have to create $(etc) here because init_cmdargs tests its
+## existence when setting Vinstallation_directory (FIXME?).
+## This goes on to affect various things, and the emacs binary fails
+## to start if Vinstallation_directory has the wrong value.
 temacs$(EXEEXT): stamp-oldxmenu $(ALLOBJS) \
                 $(lib)/libgnu.a $(EMACSRES)
        $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
          -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
+       $(MKDIR_P) $(etc)
        $(TEMACS_POST_LINK)
        test "$(CANNOT_DUMP)" = "yes" || \
          test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)