diff --git a/bin/foamPack b/bin/foamPack index 3f35f5b57dfedf1184bee7f443b172264960b36b..a719f9e23e186a227ab1e920e4af84b34eb609a7 100755 --- a/bin/foamPack +++ b/bin/foamPack @@ -89,8 +89,8 @@ find -H $packDir \ -e "\@$packDir/lib/@d" \ -e '\@/\.git/@d' \ -e '\@applications/bin/@d' \ - -e '\@wmake/utilbin/@d' \ - -e '\@/t/@d' \ + -e '\@wmake/bin/@d' \ + -e '\@/t/@d' \ -e '\@Make[.A-Za-z]*/[^/]*/@d' \ -e '\@doc/[Dd]oxygen/html@d' \ -e '\@doc/[Dd]oxygen/latex@d' \ diff --git a/bin/foamPackBin b/bin/foamPackBin index 5a60b405a9d4bc8a588ca94dc41339f934268b00..00d60ba5f04989ceb5601e5e1bf35373ba59c0c7 100755 --- a/bin/foamPackBin +++ b/bin/foamPackBin @@ -76,7 +76,7 @@ dirList=$( $packDir/lib/$arch \ $packDir/applications/bin/$arch \ $packDir/wmake/rules \ - $packDir/wmake/utilbin/$baseArch \ + $packDir/wmake/bin/$baseArch \ ; do [ -d $dir ] && echo $dir diff --git a/bin/foamPackSource b/bin/foamPackSource index b5e34c8a040a71e6be48b058b96610dc101e87b0..dbb1860bca4b8e5fcf4560c120b567354255ffa3 100755 --- a/bin/foamPackSource +++ b/bin/foamPackSource @@ -82,7 +82,7 @@ find -H $packDir \ -e '\@/\.git/@d' \ -e '\@/\.tags/@d' \ -e '\@applications/bin/@d' \ - -e '\@wmake/utilbin/@d' \ + -e '\@wmake/bin/@d' \ -e '\@/t/@d' \ -e '\@/Make[.A-Za-z]*/[^/]*/@d'\ -e '\@/platforms/@d' \ diff --git a/wmake/rules/General/sourceToDep b/wmake/rules/General/sourceToDep index f98c8f8cf457ca7a83c9dbecd9084f158586950c..14e95d6eb10f76656947ff023fc6b67c13ab585c 100644 --- a/wmake/rules/General/sourceToDep +++ b/wmake/rules/General/sourceToDep @@ -1,6 +1,6 @@ .SUFFIXES: .c .cc .cxx .cpp .C .F .f .dep -MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) +MKDEP = $(BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) .c.dep: $(MAKE_DEP)