mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-01-12 08:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.ac, maintMakefile, w32/Makefile.am: Fix autotools issues.

Browse source 
Reported by Paul Eggert <eggert@cs.ucla.edu>
This commit is contained in:
Paul Smith 2014-09-07 16:54:36 -04:00
parent 1f2fd22fec
commit bd30df4478
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,6 +13,7 @@ Makefile
Makefile.in Makefile.in
aclocal.m4 aclocal.m4
autom4te.cache autom4te.cache
config.cache
config.h config.h
config.h.in config.h.in
config.log config.log

1
config/.gitignore vendored
View file

@ -1,3 +1,4 @@
ar-lib
compile compile
config.guess config.guess
config.rpath config.rpath

5
configure.ac
View file

@ -27,7 +27,9 @@ AC_CONFIG_HEADERS([config.h])
# Automake setup # Automake setup
# We have to enable "foreign" because ChangeLog is auto-generated # We have to enable "foreign" because ChangeLog is auto-generated
AM_INIT_AUTOMAKE([1.11.1 silent-rules foreign -Wall -Werror]) # We cannot enable -Werror because gettext 0.18.1 has invalid content
# When we update gettext to 0.18.3 or better we can add it again.
AM_INIT_AUTOMAKE([1.11.1 silent-rules foreign -Wall])
# Checks for programs. # Checks for programs.
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
@ -49,7 +51,6 @@ AC_ISC_POSIX
AC_MINIX AC_MINIX
# Enable gettext, in "external" mode. # Enable gettext, in "external" mode.
AM_GNU_GETTEXT_VERSION([0.18.1]) AM_GNU_GETTEXT_VERSION([0.18.1])
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])

10
maintMakefile
View file

@ -141,13 +141,13 @@ ChangeLog: .check-git-HEAD
## Updating files. ## ## Updating files. ##
## ---------------- ## ## ---------------- ##
WGET = wget --passive-ftp -nv WGET = wget --passive-ftp -np -nv
ftp-gnu = ftp://ftp.gnu.org/gnu ftp-gnu = ftp://ftp.gnu.org/gnu
move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \ move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \
echo $(target) is unchanged; rm -f $(target).t; \ echo $(target) is unchanged; rm -f $(target).t; \
else \ else \
mv $(target).t $(target); \ mv -f $(target).t $(target); \
fi fi
# ------------------- # # ------------------- #
@ -159,8 +159,7 @@ move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \
# http://translation.sf.net/maint/ # http://translation.sf.net/maint/
# ftp://tiger.informatik.hu-berlin.de/pub/po/maint/ # ftp://tiger.informatik.hu-berlin.de/pub/po/maint/
po_wget_flags = --recursive --level=1 --no-directories --no-parent \ po_wget_flags = --recursive --level=1 --no-directories --no-check-certificate
--no-check-certificate
po_repo = http://translationproject.org/latest/$(PACKAGE) po_repo = http://translationproject.org/latest/$(PACKAGE)
.PHONY: do-po-update po-update .PHONY: do-po-update po-update
do-po-update: do-po-update:
@ -169,7 +168,8 @@ do-po-update:
&& mkdir "$$tmppo" \ && mkdir "$$tmppo" \
&& (cd "$$tmppo" \ && (cd "$$tmppo" \
&& $(WGET) $(po_wget_flags) -A '*.po' $(po_repo)) \ && $(WGET) $(po_wget_flags) -A '*.po' $(po_repo)) \
&& cp "$$tmppo"/*.po $(top_srcdir)/po && rm -rf "$$tmppo" && cp "$$tmppo"/*.po $(top_srcdir)/po \
&& rm -rf "$$tmppo"
cd po && $(MAKE) update-po cd po && $(MAKE) update-po
$(MAKE) po-check $(MAKE) po-check

2
w32/Makefile.am
View file

@ -15,6 +15,8 @@
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with
# this program. If not, see <http://www.gnu.org/licenses/>. # this program. If not, see <http://www.gnu.org/licenses/>.
AUTOMAKE_OPTIONS = subdir-objects
noinst_LIBRARIES = libw32.a noinst_LIBRARIES = libw32.a
libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \ libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \