Module Name: src
Committed By: christos
Date: Mon Aug 18 06:57:25 UTC 2014
Modified Files:
src/external/gpl2/gmake/dist: Makefile.in
src/external/gpl2/gmake/dist/config: config.guess
src/external/gpl2/gmake/dist/po: Makefile.in.in
Removed Files:
src/external/gpl2/gmake/dist/doc: make.info make.info-1 make.info-2
Log Message:
merge local changes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/config/config.guess
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/gmake/dist/doc/make.info \
src/external/gpl2/gmake/dist/doc/make.info-1 \
src/external/gpl2/gmake/dist/doc/make.info-2
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/po/Makefile.in.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/Makefile.in
diff -u src/external/gpl2/gmake/dist/Makefile.in:1.1.1.1 src/external/gpl2/gmake/dist/Makefile.in:1.2
--- src/external/gpl2/gmake/dist/Makefile.in:1.1.1.1 Mon Aug 18 02:46:49 2014
+++ src/external/gpl2/gmake/dist/Makefile.in Mon Aug 18 02:57:25 2014
@@ -330,6 +330,8 @@ all: config.h
am--refresh:
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_Makefile.in:
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -357,6 +359,8 @@ $(top_builddir)/config.status: $(top_src
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_configure:
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -371,6 +375,8 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_config.h.in:
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
Index: src/external/gpl2/gmake/dist/config/config.guess
diff -u src/external/gpl2/gmake/dist/config/config.guess:1.1.1.1 src/external/gpl2/gmake/dist/config/config.guess:1.2
--- src/external/gpl2/gmake/dist/config/config.guess:1.1.1.1 Mon Aug 18 02:47:09 2014
+++ src/external/gpl2/gmake/dist/config/config.guess Mon Aug 18 02:57:25 2014
@@ -942,6 +942,9 @@ EOF
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
Index: src/external/gpl2/gmake/dist/po/Makefile.in.in
diff -u src/external/gpl2/gmake/dist/po/Makefile.in.in:1.1.1.1 src/external/gpl2/gmake/dist/po/Makefile.in.in:1.2
--- src/external/gpl2/gmake/dist/po/Makefile.in.in:1.1.1.1 Mon Aug 18 02:47:14 2014
+++ src/external/gpl2/gmake/dist/po/Makefile.in.in Mon Aug 18 02:57:25 2014
@@ -13,7 +13,7 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SHELL = /bin/sh
+SHELL = @SHELL@
@SET_MAKE@
srcdir = @srcdir@
