From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 25 Aug 2020 02:06:28 +0000 (-0700)
Subject: remove now unnecessary find-and-replace step
X-Git-Tag: 2.46.0~20^2^2~99^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd8f13b70afb9ddc4a1a3c5dc408b126f6e04c44;p=graphviz

remove now unnecessary find-and-replace step
---

diff --git a/cmake/modify_cgraph_grammar.cmake.in b/cmake/modify_cgraph_grammar.cmake.in
deleted file mode 100644
index 231b5e938..000000000
--- a/cmake/modify_cgraph_grammar.cmake.in
+++ /dev/null
@@ -1,7 +0,0 @@
-file(READ @CMAKE_CURRENT_BINARY_DIR@/grammar.h file_contents)
-string(REPLACE "yy" "aag" file_contents "${file_contents}")
-file(WRITE @CMAKE_CURRENT_BINARY_DIR@/grammar.h "${file_contents}")
-
-file(READ @CMAKE_CURRENT_BINARY_DIR@/grammar.c file_contents)
-string(REPLACE "yy" "aag" file_contents "${file_contents}")
-file(WRITE @CMAKE_CURRENT_BINARY_DIR@/grammar.c "${file_contents}")
diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt
index 645d26b9d..b81230b1e 100644
--- a/lib/cgraph/CMakeLists.txt
+++ b/lib/cgraph/CMakeLists.txt
@@ -2,19 +2,6 @@ BISON_TARGET(Grammar grammar.y ${CMAKE_CURRENT_BINARY_DIR}/grammar.c)
 FLEX_TARGET(Scan scan.l  ${CMAKE_CURRENT_BINARY_DIR}/scan.c)
 ADD_FLEX_BISON_DEPENDENCY(Scan Grammar)
 
-# Modify files generated by Bison and Flex, to match the Autotools build.
-# - Replace "yy" with "aag" in two files
-configure_file(
-    "${TOP_SOURCE_DIR}/cmake/modify_cgraph_grammar.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_grammar.cmake"
-    @ONLY
-)
-add_custom_command(
-    OUTPUT ${BISON_Grammar_OUTPUTS}
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/modify_cgraph_grammar.cmake
-    APPEND
-)
-
 add_definitions(-DEXPORT_CGRAPH -DEXPORT_AGXBUF -DEXPORT_CGHDR -DYY_NO_UNISTD_H)
 
 include_directories(
diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index 475dd516e..6a55bc8f3 100644
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -32,10 +32,10 @@ scan.c: $(top_srcdir)/lib/cgraph/scan.l
 	@LEX@ --outfile=$@ -i $(top_srcdir)/lib/cgraph/scan.l
 
 grammar.c: y.tab.c
-	@SED@ "s/yy/aag/g" < y.tab.c > grammar.c
+	cp -f y.tab.c grammar.c
 
 grammar.h: y.tab.h
-	@SED@ "s/yy/aag/g" < y.tab.h > grammar.h
+	cp -f y.tab.h grammar.h
 
 y.tab.c y.tab.h: y.output