summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-10-26 13:50:07 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-10-26 13:50:07 +0000
commitc5bca7cdda36fef2ceea06c5f5cb26b403b8fc70 (patch)
tree42cfddbdcc79a33d368c0cb28f349425bcf5ff84
parent2e973fdf2728b681edb7001120713f64498af27a (diff)
Use Perl rather than sed to do some substitutions for Fortran files.
Fixes Compiler/140. Tom git-svn-id: http://svn.cactuscode.org/flesh/trunk@1108 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--lib/make/make.config.rules.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index 60f8e609..66737807 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -82,7 +82,7 @@ endef
# Define how to do a F77 compilation
define PREPROCESS_F77
-cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' | $(CPP) $(CPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - | sed 's/__FORTRANFILE__/"$(basename $(notdir $<)).F"/g' | sed 's.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.//.g' | $(PERL) $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f
+cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' | $(CPP) $(CPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - | $(PERL) -p -e 's/__FORTRANFILE__/"$(basename $(notdir $<)).F"/g; s.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.//.g' - | $(PERL) $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f
endef
define COMPILE_F77
@@ -94,7 +94,7 @@ endef
# Define how to do a F90 compilation
define PREPROCESS_F90
-cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' | $(CPP) $(CPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - | sed 's/__FORTRANFILE__/"$(basename $(notdir $<)).F"/g' | sed 's.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.//.g' | $(PERL) $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f
+cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' | $(CPP) $(CPPFLAGS) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DFCODE - | $(PERL) -p -e 's/__FORTRANFILE__/"$(basename $(notdir $<)).F"/g ;s.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.//.g' | $(PERL) $(F_FILE_PROCESSOR) > $(basename $(notdir $<)).f
endef
define COMPILE_F90