X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fsamba%2FMakefile;h=61dac75ddfcff405c2ab410cbe0f599d75150a3f;hp=0f221846091a60e1e7b94ba0a9190730928040f1;hb=c2efce77661ce92644e4e8c59819b38a10befa48;hpb=51fb4e32a0a1b74b8a708d4831f5459737cbf19e

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 0f22184609..61dac75ddf 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -25,8 +25,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/samba
   SECTION:=net
   CATEGORY:=Network
-  SUBMENU:=A NetBIOS/SMB implementation
-  TITLE:=A NetBIOS/SMB implementation
+  SUBMENU:=samba - NetBIOS/SMB implementation
+  TITLE:=samba - NetBIOS/SMB implementation
   DESCRIPTION:=The Samba software suite is a collection of programs that implements the\\\
   SMB protocol for unix systems, allowing you to serve files and printers to\\\
   Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred\\\
@@ -37,6 +37,7 @@ endef
 define Package/samba-server
   $(call Package/samba)
   TITLE:=NetBIOS/SMB file and print server
+  DEPENDS:=+libgcc
 endef
 
 define Package/samba-client
@@ -167,25 +168,25 @@ define Build/Compile
 endef
 
 define Package/samba-server/install	
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/samba.init $(1)/etc/init.d/samba
-	install -d -m0755 $(1)/etc/samba
-	install -m0644 ./files/smb.conf $(1)/etc/samba/smb.conf
-	install -d -m0755 $(1)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(1)/usr/bin/smbpasswd
-	install -d -m0755 $(1)/usr/lib
-	install -m0755 $(PKG_BUILD_DIR)/source/bin/libsmb.so $(1)/usr/lib/
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(1)/usr/sbin/nmbd
-	install -m0755 $(PKG_BUILD_DIR)/source/bin/smbd.shared $(1)/usr/sbin/smbd
-	install -d -m0755 $(1)/usr/share/samba
-	install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(1)/usr/share/samba/
-	install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/unicode_map.{437,850} $(1)/usr/share/samba/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba
+	$(INSTALL_DIR) $(1)/etc/samba
+	$(INSTALL_DATA) ./files/smb.conf $(1)/etc/samba/smb.conf
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(1)/usr/bin/smbpasswd
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/libsmb.so $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(1)/usr/sbin/nmbd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbd.shared $(1)/usr/sbin/smbd
+	$(INSTALL_DIR) $(1)/usr/share/samba
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(1)/usr/share/samba/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba/unicode_map.{437,850} $(1)/usr/share/samba/
 endef
 
 define Package/samba-client/install	
-	install -d -m0755 $(1)/usr/bin
-	install -m0755 $(PKG_INSTALL_DIR)/usr/bin/smbclient $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/smbclient $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,samba-server))