diff options
| -rw-r--r-- | mk/build.mk | 9 | ||||
| -rwxr-xr-x | scripts/create.sh | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index c765d4e62..61da89c18 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -638,16 +638,15 @@ bulkallmod: if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ done -${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c - @mkdir -p $(TOPDIR)/bin/tools +${BIN_DIR}/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c @$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c -${TOPDIR}/bin/tools/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c +${BIN_DIR}/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c @$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c -package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild +package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${BIN_DIR}/pkgmaker ${BIN_DIR}/pkgrebuild @echo "Generating menu structure ..." - @$(TOPDIR)/bin/tools/pkgmaker + @$(BIN_DIR)/pkgmaker @:>.menu ${BIN_DIR}/depmaker: $(TOPDIR)/tools/adk/depmaker.c diff --git a/scripts/create.sh b/scripts/create.sh index 058942314..634a87643 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -31,8 +31,8 @@ TOPDIR=$(pwd) me=$0 case :$PATH: in -(*:$TOPDIR/bin/tools:*) ;; -(*) export PATH=$PATH:$TOPDIR/bin/tools ;; +(*:$TOPDIR/bin:*) ;; +(*) export PATH=$PATH:$TOPDIR/bin ;; esac test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then @@ -43,7 +43,7 @@ test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then gzip -dc dl/"$df" | (cd build_mksh; cpio -mid) cd build_mksh/mksh bash Build.sh -r -c lto || bash Build.sh -r || exit 1 - cp mksh "$TOPDIR"/bin/tools/ + cp mksh "$TOPDIR"/bin cd "$TOPDIR" rm -rf build_mksh fi |