diff build-aux/common.mk @ 20343:bacaec9b5535

eliminate recursive make invocation in test directory tree * test/module.mk: New file created from test/Makefile.am, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-44940/module.mk, test/class-concat/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, and test/nest/module.mk. * test/Makefile.am, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-44940/module.mk, test/class-concat/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, test/nest/module.mk: Delete. * configure.ac (AC_OUTPUT): Don't generate test/Makefile. * Makefile.am: Include test/module.mk. * build-aux/common.mk, test/build-bc-overload-tests.sh: Adapt to changes in Makefile structure.
author John W. Eaton <jwe@octave.org>
date Tue, 07 Jul 2015 10:40:38 -0400
parents dbb46a7e61a4
children b65888ec820e
line wrap: on
line diff
--- a/build-aux/common.mk	Fri Jul 03 19:33:19 2015 -0400
+++ b/build-aux/common.mk	Tue Jul 07 10:40:38 2015 -0400
@@ -929,10 +929,10 @@
 endef
 
 define gdbinit_install_rule
-  if [ -f .gdbinit ]; then \
-    echo "refusing to overwrite .gdbinit with newer version from $<" 1>&2; \
+  if [ -f $@ ]; then \
+    echo "refusing to overwrite $@ with newer version from $<" 1>&2; \
   else \
-    echo "Installing .gdbinit from version at $<" ; \
+    echo "Installing $@ from version at $<" ; \
     cp $< $@; \
   fi
 endef