customize automount & unfsd; config: introduce PLUGIN_PATH

diff --git a/Makefile b/Makefile
index 7d50e39cfcd831a9086cda000d57f032ce6271ba..6c6c43f1905bda211ab30e54029e74de3cae56ce 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,11 @@ include make/neutrino.mk
 include make/libraries.mk
 include make/applications.mk
 include make/archives.mk
-include make/plugins.mk
+ifeq ($(PLUGIN_PATH), "")
+       include make/plugins.mk
+else
+       include make/custom.mk
+endif
 include make/multimedia.mk
 include make/rootfs.mk
 include make/bootloader.mk
@@ -197,6 +201,16 @@ applications:
        else \
                true; \
        fi
+       if [ $(AUTOMOUNT) = "yes" ]; then \
+               $(MAKE) $(D)/autofs; \
+       else \
+               true; \
+       fi
+       if [ $(UNFSD) = "yes" ]; then \
+               $(MAKE) $(D)/unfsd; \
+       else \
+               true; \
+       fi
 
 # multimedia.mk
 multimedia:

diff --git a/doc/config.example b/doc/config.example
index 3bcd21afcdd545336391e1c8a86c51eec4bfa41c..624b9f96fc877aa60ce6b30ead937ad9dd584b56 100755 (executable)
--- a/doc/config.example
+++ b/doc/config.example
@@ -89,6 +89,16 @@ USHARE=no
 # XUPNPD=no
 XUPNPD=no
 
+# if you want to build autofs (optional), define AUTOMOUNT=yes:
+# AUTOMOUNT=yes
+# AUTOMOUNT=no
+AUTOMOUNT=no
+
+# if you want to build unfsd (optional), define UNFSD=yes:
+# UNFSD=yes
+# UNFSD=no
+UNFSD=no
+
 ###########################################################################################
 ###########################################################################################
 
@@ -109,9 +119,12 @@ MULTIMEDIA=no
 ### Customize
 ###########################################################################################
 
-#Choose your own SKEL_ROOT_DIR (optional), define SKEL_ROOT_DIR=path_to_my_skel-root-dir
+# Choose your own SKEL_ROOT_DIR (optional), define SKEL_ROOT_DIR=path_to_my_skel-root-dir
 # SKEL_ROOT_DIR=
 
+# Choose your own PLUGIN_DIR (optional)
+# PLUGIN_PATH=
+
 # choose if you want to use WIFI (optional, define WIFI=yes/no
 WIFI=no
 

diff --git a/make/environment.mk b/make/environment.mk
index e9f31369d5929b2dcc0bd81e7637eee4a1f6ca90..5117b8ba90f77f540fc9e40080d8e7e083971194 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -5,6 +5,8 @@ include $(BASE_DIR)/config
 
 # crosstool puts "...-glibc-2.3.6-tls" configs still into "...-glibc-2.3.6"
 CROSS_BUILD_DIR = $(CROSS_BUILD_VERSION:-tls=)
+SKEL_ROOT_DIR  ?= ""
+PLUGIN_PATH    ?= ""
 
 ARCHIVE      = $(BASE_DIR)/download
 PATCHES      = $(BASE_DIR)/archive-patches
@@ -13,7 +15,6 @@ BUILD_TMP    = $(BASE_DIR)/build_tmp
 D            = $(BASE_DIR)/deps
 # backwards compatibility
 DEPDIR       = $(D)
-SKEL_ROOT_DIR ?= ""
 
 APPSDIR      = $(BASE_DIR)/tuxbox.org/apps
 HOSTPREFIX   = $(BASE_DIR)/host