changeset 17880:51a3b3fa981f

try to ensure that stray bits/stl_algo.h file is not in build tree * Makefile.am (nonexistent-file): New target. (BUILT_SOURCES): Include nonexistent-file in the list if AMCOND_HAVE_BROKEN_STL_ALGO_H is false.
author John W. Eaton <jwe@octave.org>
date Thu, 07 Nov 2013 14:40:25 -0500
parents 8b7bbe021d0f
children 7aadb87f599a
files Makefile.am
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Thu Nov 07 14:35:05 2013 -0500
+++ b/Makefile.am	Thu Nov 07 14:40:25 2013 -0500
@@ -95,6 +95,8 @@
 
 if AMCOND_HAVE_BROKEN_STL_ALGO_H
   BUILT_SOURCES += bits/stl_algo.h
+else
+  BUILT_SOURCES += nonexistent-file
 endif
 
 noinst_SCRIPTS = run-octave
@@ -137,6 +139,13 @@
 	$(MKDIR_P) bits
 	$(INSTALL_HEADER) $< $@
 
+## If we aren't trying to fix stl_algo.h, then try to ensure that
+## there isn't a stray copy sitting in the build tree.
+
+nonexistent-file:
+	rm -f bits/stl_algo.h
+.PHONY: nonexistent-file
+
 .gdbinit: etc/gdbinit
 	@$(gdbinit_install_rule)