use SMB_PREFIX=/var for all boxes

diff --git a/make/applications.mk b/make/applications.mk
index 9eda3643914b9ee5161580a73eb9548f0b4b9a12..3598cb4c0d1d3de017d1c7535352431102f68571 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -309,16 +309,7 @@ $(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 $(D)/zlib | $(TARG
        rm -rf $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER) $(BUILD_TMP)/.remove
        touch $@
 
-
-ifeq ($(PLATFORM), apollo)
-SMB_PREFIX=/usr
-endif
-ifeq ($(PLATFORM), kronos)
-SMB_PREFIX=/usr
-endif
-ifeq ($(PLATFORM), nevis)
-SMB_PREFIX=/var
-endif
+# SAMBA
 ifeq ($(PLATFORM), nevis)
 SAMBA_BUILDS = \
        bin/smbd \
@@ -330,11 +321,8 @@ SAMBA_BUILDS = \
        bin/nmbd
 SAMBA_OPT = \
        bin/smbclient \
-       bin/smbmount \
-       bin/smbmnt \
        bin/smbpasswd
 endif
-
 # // use SAMBA_EXTRA_DIR to build it not in TARGETPREFIX
 SAMBA_EXTRA_DIR=yes
 ifeq ($(SAMBA_EXTRA_DIR), yes)
@@ -342,8 +330,9 @@ SAMBA_TARGET=$(BUILD_TMP)/build_samba
 else
 SAMBA_TARGET=$(TARGETPREFIX)
 endif
+SMB_PREFIX=/var
 $(D)/samba2: $(ARCHIVE)/samba-$(SAMBA2_VER).tar.gz | $(TARGETPREFIX)
-       rm -f $(SAMBA_TARGET)
+       rm -fr $(SAMBA_TARGET)
        mkdir -p $(SAMBA_TARGET)
        $(UNTAR)/samba-$(SAMBA2_VER).tar.gz
        set -e; cd $(BUILD_TMP)/samba-$(SAMBA2_VER); \
@@ -400,11 +389,11 @@ $(D)/samba2: $(ARCHIVE)/samba-$(SAMBA2_VER).tar.gz | $(TARGETPREFIX)
                install $(BUILD_TMP)/samba-$(SAMBA2_VER)/source/bin/$$i $(SAMBA_TARGET)$(SMB_PREFIX)/bin; \
        done
        install -d $(SAMBA_TARGET)$(SMB_PREFIX)/etc/samba/private
-       install -d $(SAMBA_TARGET)/etc/init.d
+       install -d $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d
        install $(SCRIPTS)/smb.conf $(SAMBA_TARGET)$(SMB_PREFIX)/etc
-       install -m 755 $(SCRIPTS)/samba $(SAMBA_TARGET)/etc/init.d/samba
-       ln -sf samba $(SAMBA_TARGET)/etc/init.d/S99samba
-       ln -sf samba $(SAMBA_TARGET)/etc/init.d/K01samba
+       install -m 755 $(SCRIPTS)/samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/samba
+       ln -sf samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/S99samba
+       ln -sf samba $(SAMBA_TARGET)$(SMB_PREFIX)/etc/init.d/K01samba
        cp -a $(SAMBA_TARGET)/* $(TARGETPREFIX)
        $(TARGET)-strip $(SAMBA_TARGET)$(SMB_PREFIX)/bin/*
        for i in $(SAMBA_OPT); do \