diff --git a/bin/fixdepends.sh b/bin/fixdepends.sh index 8ba8bfe1fefc40c3f3ede433fd96b14806e78109..81439a3820b2c4d298acbf6601926e6d66353eef 100755 --- a/bin/fixdepends.sh +++ b/bin/fixdepends.sh @@ -15,6 +15,7 @@ fi # Paths starting with $1 ==> $(SRCDIR) # Paths starting with $2 ==> $(PIKE_SRC_DIR) +# Paths starting with $3/bundles/ ==> removed # Paths starting with $3 ==> $(BUILD_BASE) # Paths starting with `pwd` ==> empty # Rules for object files are duplicated for protos files (if needed). @@ -30,6 +31,7 @@ d3="`echo \"$3\" | sed -e 's:[.*[\\^$@]:\\\\&:g'`" if grep .protos $1/Makefile.in >/dev/null 2>&1; then sed -e "s@\([ ]\)$d1/\([-a-zA-Z0-9.,_]*\)@\1\$(SRCDIR)/\2@g" \ -e "s@\([ ]\)$d2/\([-a-zA-Z0-9.,_]*\)@\1\$(PIKE_SRC_DIR)/\2@g" \ + -e "s@\([ ]\)$d3/bundles/[^ ]*@\1@g" \ -e "s@\([ ]\)$d3/\([-a-zA-Z0-9.,_]*\)@\1\$(BUILD_BASE)/\2@g" \ -e "s@\([ ]\)`pwd`\([^ ]\)*@\1./\2@" \ -e 's/^\([-a-zA-Z0-9.,_]*\)\.o: /\1.o \1.protos: /g' \ @@ -38,6 +40,7 @@ if grep .protos $1/Makefile.in >/dev/null 2>&1; then else sed -e "s@\([ ]\)$d1/\([-a-zA-Z0-9.,_]*\)@\1\$(SRCDIR)/\2@g" \ -e "s@\([ ]\)$d2/\([-a-zA-Z0-9.,_]*\)@\1\$(PIKE_SRC_DIR)/\2@g" \ + -e "s@\([ ]\)$d3/bundles/[^ ]*@\1@g" \ -e "s@\([ ]\)$d3/\([-a-zA-Z0-9.,_]*\)@\1\$(BUILD_BASE)/\2@g" \ -e "s@\([ ]\)`pwd`\([^ ]\)*@\1./\2@" \ -e 's@\([ ]\)/[^ ]*@\1@g' \