diff --git a/wmake/Makefile b/wmake/Makefile index 78b442e43df46b2ec4e517b835504945bf4d0ad4..ae4fd43f1373231dc203f9f390a330707aa5038f 100644 --- a/wmake/Makefile +++ b/wmake/Makefile @@ -106,7 +106,7 @@ SEXE = a.out GENERAL_RULES = $(WM_DIR)/rules/General RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER) -UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER) +BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER) include $(GENERAL_RULES)/general include $(RULES)/general diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles index 3ccc3fa2213ed72522284b61908db1207400d10b..c36f153b3ce5006636f96dc1f722734383f733c1 100755 --- a/wmake/scripts/makeFiles +++ b/wmake/scripts/makeFiles @@ -39,7 +39,7 @@ then exit 1 fi -utilbin=$WM_DIR/utilbin/$WM_ARCH$WM_COMPILER +bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER [ -d Make ] || mkdir Make rm -f Make/files @@ -51,7 +51,7 @@ do if [ $dir != . ] then baseDir=`echo $dir | sed 's%^\./%%'` - baseDirName=`echo $baseDir | $utilbin/dirToString` + baseDirName=`echo $baseDir | $bin/dirToString` if [ $baseDirName != Make ] then @@ -66,7 +66,7 @@ files=`find . -name "*.[cCylfF]" -type f -print` for file in $files do - pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $utilbin/dirToString` + pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString` fileName=`echo ${file##*/}` if [ "$pathName" != "" ] diff --git a/wmake/src/Makefile b/wmake/src/Makefile index daa1e56c6bc965a6d566ceb5b59d915bb2517818..d764aeba8801353d2d164ec88115e1ba0029ea38 100644 --- a/wmake/src/Makefile +++ b/wmake/src/Makefile @@ -43,22 +43,22 @@ SHELL = /bin/sh .SUFFIXES: .SUFFIXES: .o -UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER) +BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER) -all: $(UTILBIN)/dirToString $(UTILBIN)/wmkdep +all: $(BIN)/dirToString $(BIN)/wmkdep clean: - rm -f $(UTILBIN)/dirToString $(UTILBIN)/wmkdep 2>/dev/null + rm -f $(BIN)/dirToString $(BIN)/wmkdep 2>/dev/null -$(UTILBIN)/dirToString: dirToString.c - @mkdir -p $(UTILBIN) - $(cc) $(cFLAGS) dirToString.c -o $(UTILBIN)/dirToString +$(BIN)/dirToString: dirToString.c + @mkdir -p $(BIN) + $(cc) $(cFLAGS) dirToString.c -o $(BIN)/dirToString -$(UTILBIN)/wmkdep: wmkdep.l - @mkdir -p $(UTILBIN) +$(BIN)/wmkdep: wmkdep.l + @mkdir -p $(BIN) flex wmkdep.l - $(cc) $(cFLAGS) lex.yy.c -o $(UTILBIN)/wmkdep + $(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep #------------------------------------------------------------------------------ diff --git a/wmake/src/dirToString.c b/wmake/src/dirToString.c index 1116214530df2adf989f89bd9999e958de8ac898..b5fb428b0ed462964838b917257087cce9b6e910 100644 --- a/wmake/src/dirToString.c +++ b/wmake/src/dirToString.c @@ -34,10 +34,10 @@ Usage e.g. using sh - baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString` + baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString` using csh - set baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString` + set baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString` \*----------------------------------------------------------------------------*/