Replace scripts/ with bin/ and FW_SCRIPTDIR with FW_BINDIR. FW_BINDIR is now also added to $PATH.

git-svn-id: http://svn.howett.net/svn/theos/trunk@281 4410221e-0ddf-4ce3-99c0-2db6c0dbc727

makefiles/common.mk

@@ -5,14 +5,16 @@ ifeq ($(FRAMEWORKDIR),)
 _FW_RELATIVE_MAKE_DIR = $(dir $(lastword $(MAKEFILE_LIST)))
 FRAMEWORKDIR := $(shell cd $(_FW_RELATIVE_MAKE_DIR); cd ..; pwd)
 endif
-FW_SCRIPTDIR := $(FRAMEWORKDIR)/scripts
 FW_MAKEDIR := $(FRAMEWORKDIR)/makefiles
+FW_BINDIR := $(FRAMEWORKDIR)/bin
 FW_LIBDIR := $(FRAMEWORKDIR)/lib
 FW_INCDIR := $(FRAMEWORKDIR)/include
 FW_MODDIR := $(FRAMEWORKDIR)/mod
-export FRAMEWORKDIR FW_SCRIPTDIR FW_MAKEDIR FW_LIBDIR FW_INCDIR
+export FRAMEWORKDIR FW_BINDIR FW_MAKEDIR FW_LIBDIR FW_INCDIR
 export FW_PROJECT_DIR
 
+export PATH := $(FW_BINDIR):$(PATH)
+
 _FW_MODULES := $(MODULES)
 
 uname_s := $(shell uname -s)

makefiles/package.mk

@@ -14,7 +14,7 @@ stage:: internal-stage
 package::
 endif
 
-FAKEROOT := $(FW_SCRIPTDIR)/fakeroot.sh -p "$(FW_PROJECT_DIR)/.debmake/fakeroot"
+FAKEROOT := $(FW_BINDIR)/fakeroot.sh -p "$(FW_PROJECT_DIR)/.debmake/fakeroot"
 export FAKEROOT
 
 # Only do the master packaging rules if we're the toplevel make invocation.
@@ -43,7 +43,7 @@ FW_PACKAGE_NAME := $(shell grep Package "$(FW_PACKAGE_CONTROL_PATH)" | cut -d' '
 FW_PACKAGE_ARCH := $(shell grep Architecture "$(FW_PACKAGE_CONTROL_PATH)" | cut -d' ' -f2)
 FW_PACKAGE_VERSION := $(shell grep Version "$(FW_PACKAGE_CONTROL_PATH)" | cut -d' ' -f2)
 
-FW_PACKAGE_BUILDNUM = $(shell TOP_DIR="$(TOP_DIR)" $(FW_SCRIPTDIR)/deb_build_num.sh $(FW_PACKAGE_NAME) $(FW_PACKAGE_VERSION))
+FW_PACKAGE_BUILDNUM = $(shell TOP_DIR="$(TOP_DIR)" $(FW_BINDIR)/deb_build_num.sh $(FW_PACKAGE_NAME) $(FW_PACKAGE_VERSION))
 FW_PACKAGE_DEBVERSION = $(shell grep Version "$(FW_STAGING_DIR)/DEBIAN/control" | cut -d' ' -f2)
 
 FW_PACKAGE_FILENAME = $(FW_PACKAGE_NAME)_$(FW_PACKAGE_DEBVERSION)_$(FW_PACKAGE_ARCH)

makefiles/rules.mk

@@ -44,21 +44,21 @@ $(FW_OBJ_DIR)/%.cpp.o: %.cpp
 	$(ECHO_COMPILING)$(TARGET_CXX) -c $(ALL_CFLAGS) $(ALL_CFLAGS) $(ALL_CCFLAGS) $< -o $@$(ECHO_END)
 
 $(FW_OBJ_DIR)/%.xm.o: %.xm
-	$(ECHO_LOGOS)$(FW_SCRIPTDIR)/logos.pl $< > $(FW_OBJ_DIR)/$<.mm$(ECHO_END)
+	$(ECHO_LOGOS)$(FW_BINDIR)/logos.pl $< > $(FW_OBJ_DIR)/$<.mm$(ECHO_END)
 	$(ECHO_COMPILING)$(TARGET_CXX) -c $(ALL_CFLAGS) $(ALL_OBJCFLAGS) $(ALL_OBJCCFLAGS) $(FW_OBJ_DIR)/$<.mm -o $@$(ECHO_END)
 	$(ECHO_NOTHING)rm $(FW_OBJ_DIR)/$<.mm$(ECHO_END)
 
 %.mm: %.l.mm
-	$(FW_SCRIPTDIR)/logos.pl $< > $@
+	$(FW_BINDIR)/logos.pl $< > $@
 
 %.mm: %.xmm
-	$(FW_SCRIPTDIR)/logos.pl $< > $@
+	$(FW_BINDIR)/logos.pl $< > $@
 
 %.mm: %.xm
-	$(FW_SCRIPTDIR)/logos.pl $< > $@
+	$(FW_BINDIR)/logos.pl $< > $@
 
 %.m: %.xm
-	$(FW_SCRIPTDIR)/logos.pl $< > $@
+	$(FW_BINDIR)/logos.pl $< > $@
 
 ifneq ($(FW_BUILD_DIR),.)
 $(FW_BUILD_DIR):