diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-08-12 22:17:06 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-08-12 22:17:06 +0000 |
| commit | f3c9aae0de05d708d1c1c257ac73243d8d33b6ad (patch) | |
| tree | f718ed17ca6ed5498934976485ba9cfe752d78d6 /lib/make/make.config.rules.in | |
| parent | ae8ba8ef3d6141956d20ebdafce072cd9b4ad4ff (diff) | |
Change a regex to work around a bug in the perl on RHEL. Also transferred
the full perl expression to the other place it should have been used, which
may sort out excessive rebuilding on windows.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3830 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.config.rules.in')
| -rw-r--r-- | lib/make/make.config.rules.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index 9e336a13..5909cfed 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -1,3 +1,4 @@ + # /*@@ # @file make.config.rules.in # @date Sun Jan 17 22:31:16 1999 @@ -32,11 +33,12 @@ INCLUDE_LINE = $(patsubst %,-I"%",$(call TRANSFORM_DIRS,$(INC_DIRS))) ifeq ($(strip $(PERL_BACKUP_NECESSARY)),) define DEPENDENCY_FIXER $(PERL) -pi -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /);\ - s:\s[^\s]*[/\\\]($(DEP_EXCLUDE_FILES))\b::g" $@ + s:\s+\S*[/\\\]($(DEP_EXCLUDE_FILES))\b::g" $@ endef else define DEPENDENCY_FIXER - $(PERL) -pi.bak -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /)" $@ + $(PERL) -pi.bak -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /);\ + s:\s+\S*[/\\\]($(DEP_EXCLUDE_FILES))\b::g" $@ rm $@.bak endef endif |