Module Name: src
Committed By: apb
Date: Thu Jul 14 17:29:43 UTC 2011
Modified Files:
src/gnu/dist/autoconf: Makefile.in
src/gnu/dist/gettext/gettext-runtime: Makefile.in
src/gnu/dist/gettext/gettext-runtime/libasprintf: Makefile.in
src/gnu/dist/gettext/gettext-tools: Makefile.in
Log Message:
Sprinkle some "NetBSD_DISABLED_" prefixes in file names in Makefile
targets, to ensure that the associated commands do not run. This should
prevent source files from being overwritten at build time by autoconf
and friends. Fixes PR 45132.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/gnu/dist/autoconf/Makefile.in
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gettext/gettext-runtime/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/gnu/dist/gettext/gettext-runtime/libasprintf/Makefile.in
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gettext/gettext-tools/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/autoconf/Makefile.in
diff -u src/gnu/dist/autoconf/Makefile.in:1.4 src/gnu/dist/autoconf/Makefile.in:1.5
--- src/gnu/dist/autoconf/Makefile.in:1.4 Wed Nov 14 20:00:40 2001
+++ src/gnu/dist/autoconf/Makefile.in Thu Jul 14 17:29:43 2011
@@ -427,7 +427,7 @@
# is changed, acversion.m4 is built only after the new version number is
# propagated to the Makefile. (Libtool uses the same guarantee.)
-$(srcdir)/acversion.m4: $(srcdir)/acversion.in $(srcdir)/configure.ac
+$(srcdir)/NetBSD_DISABLED_acversion.m4: $(srcdir)/acversion.in $(srcdir)/configure.ac
sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/acversion.in >acversion.tm4
mv acversion.tm4 $(srcdir)/acversion.m4
Index: src/gnu/dist/gettext/gettext-runtime/Makefile.in
diff -u src/gnu/dist/gettext/gettext-runtime/Makefile.in:1.2 src/gnu/dist/gettext/gettext-runtime/Makefile.in:1.3
--- src/gnu/dist/gettext/gettext-runtime/Makefile.in:1.2 Mon May 30 01:32:44 2005
+++ src/gnu/dist/gettext/gettext-runtime/Makefile.in Thu Jul 14 17:29:43 2011
@@ -314,7 +314,7 @@
.SUFFIXES:
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/NetBSD_DISABLED_Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -341,7 +341,7 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/NetBSD_DISABLED_configure: $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -355,14 +355,14 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+$(srcdir)/NetBSD_DISABLED_config.h.in: $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
distclean-hdr:
-rm -f config.h stamp-h1
-intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
+intl/NetBSD_DISABLED_Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
@@ -843,7 +843,7 @@
# vms_jackets.h is a header that comes with Compaq's "porting library".
# KEEP_CRTL_SETLOCALE tells it to not override the native locale support.
-intl/libgnuintl.h_vms: intl/libgnuintl.h.in
+intl/NetBSD_DISABLED_libgnuintl.h_vms: intl/libgnuintl.h.in
sed -e 's,@''HAVE_POSIX_PRINTF''@,1,g ' \
-e 's,@''HAVE_ASPRINTF''@,0,g' \
-e 's,@''HAVE_SNPRINTF''@,0,g' \
@@ -901,14 +901,14 @@
-e '/#undef INSTALLPREFIX$$/d' \
< $(srcdir)/config.h.in > $@
-intl/libgnuintl.h.msvc-static: intl/libgnuintl.h.in
+intl/NetBSD_DISABLED_libgnuintl.h.msvc-static: intl/libgnuintl.h.in
sed -e 's,@''HAVE_POSIX_PRINTF''@,0,g ' \
-e 's,@''HAVE_ASPRINTF''@,0,g' \
-e 's,@''HAVE_SNPRINTF''@,0,g' \
-e 's,@''HAVE_WPRINTF''@,1,g' \
< $(srcdir)/intl/libgnuintl.h.in > $@
-intl/libgnuintl.h.msvc-shared: intl/libgnuintl.h.in windows/dllexport.h
+intl/NetBSD_DISABLED_libgnuintl.h.msvc-shared: intl/libgnuintl.h.in windows/dllexport.h
sed -e 's,@''HAVE_POSIX_PRINTF''@,0,g ' \
-e 's,@''HAVE_ASPRINTF''@,0,g' \
-e 's,@''HAVE_SNPRINTF''@,0,g' \
Index: src/gnu/dist/gettext/gettext-runtime/libasprintf/Makefile.in
diff -u src/gnu/dist/gettext/gettext-runtime/libasprintf/Makefile.in:1.1.1.1 src/gnu/dist/gettext/gettext-runtime/libasprintf/Makefile.in:1.2
--- src/gnu/dist/gettext/gettext-runtime/libasprintf/Makefile.in:1.1.1.1 Fri Apr 29 15:00:41 2005
+++ src/gnu/dist/gettext/gettext-runtime/libasprintf/Makefile.in Thu Jul 14 17:29:43 2011
@@ -302,7 +302,7 @@
.SUFFIXES: .pdf .c .cc .dvi .html .info .lo .o .obj .ps .texi
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/NetBSD_DISABLED_Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -329,7 +329,7 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/NetBSD_DISABLED_configure: $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -343,7 +343,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+$(srcdir)/NetBSD_DISABLED_config.h.in: $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
@@ -454,7 +454,7 @@
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
exit 1; \
fi
-$(srcdir)/autosprintf.info: autosprintf.texi
+$(srcdir)/NetBSD_DISABLED_autosprintf.info: autosprintf.texi
autosprintf.dvi: autosprintf.texi
autosprintf.pdf: autosprintf.texi
autosprintf.html: autosprintf.texi
Index: src/gnu/dist/gettext/gettext-tools/Makefile.in
diff -u src/gnu/dist/gettext/gettext-tools/Makefile.in:1.2 src/gnu/dist/gettext/gettext-tools/Makefile.in:1.3
--- src/gnu/dist/gettext/gettext-tools/Makefile.in:1.2 Mon May 30 01:32:44 2005
+++ src/gnu/dist/gettext/gettext-tools/Makefile.in Thu Jul 14 17:29:43 2011
@@ -367,7 +367,7 @@
.SUFFIXES:
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/NetBSD_DISABLED_Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -394,7 +394,7 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/NetBSD_DISABLED_configure: $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -408,7 +408,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+$(srcdir)/NetBSD_DISABLED_config.h.in: $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
@@ -827,7 +827,7 @@
# Files copied from other directories.
all-local: $(srcdir)/ABOUT-NLS
-$(srcdir)/ABOUT-NLS: $(srcdir)/../gettext-runtime/ABOUT-NLS
+$(srcdir)/NetBSD_DISABLED_ABOUT-NLS: $(srcdir)/../gettext-runtime/ABOUT-NLS
cp $(srcdir)/../gettext-runtime/ABOUT-NLS $(srcdir)/ABOUT-NLS
# VMS support.
