Fixes to allow "make dist" etc. to work again.

diff --git a/ChangeLog b/ChangeLog
index 7e380db9f4b997ef6c141272ba9b8dfe8ddffd7f..9712532fd50235e771d139df380417e0fe307c29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-09  Paul D. Smith  <psmith@gnu.org>
+
+       * Makefile.am (EXTRA_make_SOURCES): Add vmsjobs.c
+       (MAYBE_W32): Rework how SUBDIRS are handled so that "make dist"
+       recurses to the w32 directory, even on non-Windows systems.  Use
+       the method suggested in the automake manual.
+       * configure.in: Add w32/Makefile to AC_CONFIG_FILES.
+       * maintMakefile (gnulib-url): They moved the texinfo.tex files.
+
 2005-05-07  Paul D. Smith  <psmith@gnu.org>
 
        * main.c (die): If we're dying with a fatal error (not that a

diff --git a/Makefile.am b/Makefile.am
index 0877aa2881ce3618f89a654319c01bd297001c09..c8c7cd468cb6243ed24eaa2c0d876df4608f3628 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,15 @@
 AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr
 ACLOCAL_AMFLAGS        =  -I config
 
-SUBDIRS =      glob config po doc
 # Only process if target is MS-Windows
 if WINDOWSENV
-    SUBDIRS += w32
-    W32INC :=  -I $(top_srcdir)/w32/include
-    W32LIB :=  -Lw32 -lw32
+  MAYBE_W32 =  w32
+  W32INC =     -I $(top_srcdir)/w32/include
+  W32LIB =     -Lw32 -lw32
 endif
 
+SUBDIRS =      glob config po doc $(MAYBE_W32)
+
 bin_PROGRAMS = make
 
 if USE_CUSTOMS
@@ -25,7 +26,7 @@ make_SOURCES =        ar.c arscan.c commands.c default.c dir.c expand.c file.c \
                misc.c read.c remake.c $(remote) rule.c signame.c \
                variable.c version.c vpath.c hash.c
 
-EXTRA_make_SOURCES = remote-stub.c remote-cstms.c
+EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c
 
 noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
                debug.h getopt.h gettext.h hash.h

diff --git a/configure.in b/configure.in
index 4d09f8517b2f996e4f0bc9b0b99ee02f3ad75d05..783d180ef9f4c94680a1d94653c34ccb19396b32 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -356,7 +356,7 @@ MAKE_HOST="$host"
 AC_SUBST(MAKE_HOST)
 
 w32_target_env=no
-AM_CONDITIONAL(WINDOWSENV, false)
+AM_CONDITIONAL([WINDOWSENV], false)
 
 case "$host" in
   *-*-mingw32)
@@ -425,12 +425,7 @@ esac
 
 
 # Specify what files are to be created.
-AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile)
-
-# Only process if target is MS-Windows
-if test "$w32_target_env" == yes; then
-    AC_CONFIG_FILES(w32/Makefile)
-fi
+AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile w32/Makefile)
 
 # OK, do it!
 

diff --git a/maintMakefile b/maintMakefile
index 111e6a359e486056d60e087575a4608dea164053..00432a786ea52fd9feb73e741c404e92b0483517 100644 (file)
--- a/maintMakefile
+++ b/maintMakefile
@@ -157,7 +157,7 @@ get-config/config.guess get-config/config.sub:
          && $(WGET) $(config-url) -O $(target).t \
          && $(move_if_change)
 
-gnulib-url = $(savannah-url)/gnulib/gnulib/config/$(patsubst get-config/%,%,$@)
+gnulib-url = $(savannah-url)/gnulib/gnulib/build-aux/$(patsubst get-config/%,%,$@)
 get-config/texinfo.tex:
        @echo $(WGET) $(gnulib-url) -O $(target) \
          && $(WGET) $(gnulib-url) -O $(target).t \

diff --git a/po/ChangeLog b/po/ChangeLog
index 59cafe932b5664c25345eaf2f59833b21be05b4f..437c1eaf18dd05afdb98f34520b377b06e43fcfb 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-09  Paul D. Smith  <psmith@gnu.org>
+
+       * POTFILES.in: Add new file vmsjobs.c.
+
 2005-04-06  Paul D. Smith  <psmith@gnu.org>
 
        * LINGUAS: Added a new translation for Kinywarwanda (rw).

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 30b7864b245a594b7135a1d23d23a323487260fc..45d162fadb42276176ecc3d33cc6e3125fdd15d8 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,4 +22,5 @@ signame.c
 variable.c
 variable.h
 vmsfunctions.c
+vmsjobs.c
 vpath.c