(CXXFLAGS): New var.

[bison.git] / Makefile.maint

diff --git a/Makefile.maint b/Makefile.maint
index e2e90f742f70553269fa9ba80f54265c64b90271..436328166c1150aa1fc363a9325f2bd54acbbfc5 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -2,7 +2,7 @@
 # This Makefile fragment is shared between fileutils, sh-utils, textutils,
 # CPPI, Bison, and Autoconf.
 
-## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -97,7 +97,16 @@ m4-check:
 po-check:
        if test -f po/POTFILES.in; then \
          grep -E -v '^(#|$$)' po/POTFILES.in | sort > $@-1; \
-         grep -E -l '\b_\(' lib/*.[ch] src/*.[ch] | sort > $@-2; \
+         files=; \
+         for file in lib/*.[chly] src/*.[chly]; do \
+           case $$file in \
+           *.[ch]) \
+             base=`expr " $$file" : ' \(.*\)\..'`; \
+             { test -f $$base.l || test -f $$base.y; } && continue;; \
+           esac; \
+           files="$$files $$file"; \
+         done; \
+         grep -E -l '\bN?_\([^)"]*("|$$)' $$files | sort > $@-2; \
          diff -u $@-1 $@-2 || exit 1; \
          rm -f $@-1 $@-2; \
        fi
@@ -200,6 +209,9 @@ my-distcheck: $(local-check)
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"
 
+WGET = wget
+WGETFLAGS = -C off
+
 tgz-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/  -//')
 tgz-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/  -//')
 bz2-md5 = $(shell md5sum < $(my_distdir).tar.bz2|sed 's/  -//')
@@ -215,7 +227,7 @@ rel-check:
        md5_tmp=/tmp/rel-check-md5-$$$$; \
        set -e; \
        trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
-       wget -q --output-document=$$tarz $(url); \
+       $(WGET) $(WGETFLAGS) -q --output-document=$$tarz $(url); \
        echo "$(md5)  -" > $$md5_tmp; \
        md5sum -c $$md5_tmp < $$tarz
 
@@ -269,7 +281,6 @@ announcement: NEWS ChangeLog $(rel-files)
 ## Updating files.  ##
 ## ---------------- ##
 
-WGET = wget
 ftp-gnu = ftp://ftp.gnu.org/gnu
 
 # Use mv, if you don't have/want move-if-change.
@@ -295,7 +306,7 @@ do-po-update:
        tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
        rm -rf $$tmppo && \
        mkdir $$tmppo && \
-       (cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
+       (cd $$tmppo && $(WGET) $(WGETFLAGS) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
        cp $$tmppo/*.po po
        cd po && $(MAKE) update-po
        $(MAKE) po-check
@@ -333,7 +344,7 @@ url = $($(notdir $(target))-url_prefix)$(notdir $(target))
 
 .PHONY: $(get-targets)
 $(get-targets):
-       $(WGET) $(url) -O $(target).t \
+       $(WGET) $(WGETFLAGS) $(url) -O $(target).t \
          && $(move_if_change) $(target).t $(target)
 
 cvs_files ?= $(srcdir)/config/depcomp $(srcdir)/config/missing $(srcdir)/config/mkinstalldirs \
@@ -346,7 +357,7 @@ wget-update: $(get-targets)
 cvs-update:
        for f in $(cvs_files); do                                     \
          test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \
-         file=$$(basename $$f);                                      \
+         file=`basename $$f`;                                        \
          echo checking out $$file...;                                \
          $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t \
            && $(move_if_change) $$f.t $$f;                           \