Adjusting Makefiles and config files for a master RaspberryPi

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index e1e8f08ddaffb3b964c78035dce2c966e1179efb..83ba1ba24a81244e8b41463eae568054d150b8bc 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -2,10 +2,14 @@ BASE := ..
 
 include $(BASE)/common.mk
 
-all: tree parser compiler rmi runtime installer
+all: mkdir tree parser compiler rmi runtime installer
 
 infra: runtime installer
 
+PHONY += mkdir
+mkdir:
+       [ -d ../bin ] || mkdir ../bin
+
 # Parser compilation and run
 PHONY += tree
 tree:
@@ -233,9 +237,10 @@ runtime:
        $(JAVAC) -classpath .:$(RUNTIMEJARS):$(PHONEJARS):$(ZIPJARS) iotruntime/*.java iotruntime/master/*.java iotruntime/slave/*.java iotruntime/messages/*.java iotruntime/stub/*.java iotruntime/zigbee/*.java -d $(BIN_DIR)
        cp ../localconfig/iotruntime/IoTMaster.config $(BIN_DIR)/iotruntime/
        cp ../localconfig/iotruntime/IoTSlave.config $(BIN_DIR)/iotruntime/
-       cp ../others/sslkey/*.jks $(BIN_DIR)/iotruntime/
+       cp ../localconfig/iotruntime/*.bash $(BIN_DIR)/iotruntime/
        cp -r ../localconfig/mysql $(BIN_DIR)/iotruntime/
        cp -r ../localconfig/tomoyo $(BIN_DIR)/iotruntime/
+       [ -d $(BIN_DIR)/iotruntime/log ] || mkdir $(BIN_DIR)/iotruntime/log
 
 PHONY += doc
 doc: runtime installer rmi compiler