X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsamba;h=e7b3d9d75c99b6b146dc8ed924f1bcc40d6d6248;hp=c3010e9c76c69acfb1f218e328e4e7c173abb68f;hb=5fcb6d5a39c4aa7fe75fae2ba6bfcc617ee384ef;hpb=10a04d70a4c10ce105fe47fea763fc390c2036dd

diff --git a/lfs/samba b/lfs/samba
index c3010e9c76..e7b3d9d75c 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/source && ./configure \
 				    --prefix=/usr \
-				    --sysconfdir=/etc \
+				    --sysconfdir=/var/ipfire/samba \
 				    --localstatedir=/var \
 				    --with-piddir=/var/run \
 				    --with-fhs \
@@ -101,24 +101,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
 	cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
 	cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
-	cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /etc/samba
+	cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
 #	cd $(DIR_APP)/source && install -v -m755 -d /usr/share/doc/samba-3.0.22
 #	cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22
 #	cd $(DIR_APP)/source && ln -v -s ../../samba/swat  /usr/share/doc/samba-3.0.22
 	echo "swat            901/tcp" >> /etc/services
-	echo "# Begin /etc/xinetd.d/swat"		>> /etc/xinetd.d/swat
-	echo ""					>> /etc/xinetd.d/swat
-	echo "service swat"				>> /etc/xinetd.d/swat
-	echo "{"					>> /etc/xinetd.d/swat
-	echo "    port            = 901"		>> /etc/xinetd.d/swat
-	echo "    socket_type     = stream"	>> /etc/xinetd.d/swat
-	echo "    wait            = no"		>> /etc/xinetd.d/swat
-	echo "    only_from       = 127.0.0.1"	>> /etc/xinetd.d/swat
-	echo "    user            = root"		>> /etc/xinetd.d/swat
-	echo "    server          = /usr/sbin/swat"	>> /etc/xinetd.d/swat
-	echo "    log_on_failure  += USERID"	>> /etc/xinetd.d/swat
-	echo "}"					>> /etc/xinetd.d/swat
-	echo ""					>> /etc/xinetd.d/swat
-	echo "# End /etc/xinetd.d/swat"		>> /etc/xinetd.d/swat
+	echo "# Begin /var/ipfire/xinetd.d/swat"		>> /var/ipfire/xinetd.d/swat
+	echo ""					>> /var/ipfire/xinetd.d/swat
+	echo "service swat"				>> /var/ipfire/xinetd.d/swat
+	echo "{"					>> /var/ipfire/xinetd.d/swat
+	echo "    port            = 901"		>> /var/ipfire/xinetd.d/swat
+	echo "    socket_type     = stream"	>> /var/ipfire/xinetd.d/swat
+	echo "    wait            = no"		>> /var/ipfire/xinetd.d/swat
+	echo "    only_from       = 127.0.0.1"	>> /var/ipfire/xinetd.d/swat
+	echo "    user            = root"		>> /var/ipfire/xinetd.d/swat
+	echo "    server          = /usr/sbin/swat"	>> /var/ipfire/xinetd.d/swat
+	echo "    log_on_failure  += USERID"	>> /var/ipfire/xinetd.d/swat
+	echo "}"					>> /var/ipfire/xinetd.d/swat
+	echo ""					>> /var/ipfire/xinetd.d/swat
+	echo "# End /var/ipfire/xinetd.d/swat"		>> /var/ipfire/xinetd.d/swat
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)