Geändert:

[ipfire-2.x.git] / lfs / xinetd

diff --git a/lfs/xinetd b/lfs/xinetd
index 6eaffeb9dd235dac2012c35775ed66b12b800c7f..9de9a842c35a36ab54f4c12e1ad548d7fd7a12b4 100644 (file)
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -30,9 +30,11 @@ VER        = 2.3.14
 
 THISAPP    = xinetd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = xinetd
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh xinetd $(THISAPP)-ipfire-beta-1
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -78,21 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure --prefix=/usr --with-loadavg --sysconfdir=/var/ipfire/xinetd
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd.d
-       echo "# Begin /var/ipfire/xinetd"                               > /var/ipfire/xinetd.conf
-       echo "# Configuration file for xinetd"          >> /var/ipfire/xinetd.conf
-       echo "#"                                                >> /var/ipfire/xinetd.conf
-       echo "defaults"                                         >> /var/ipfire/xinetd.conf
-       echo "{"                                                >> /var/ipfire/xinetd.conf
-       echo "      instances       = 60"                       >> /var/ipfire/xinetd.conf
-       echo "      log_type        = SYSLOG daemon"    >> /var/ipfire/xinetd.conf
-       echo "      log_on_success  = HOST PID USERID"  >> /var/ipfire/xinetd.conf
-       echo "      log_on_failure  = HOST USERID"      >> /var/ipfire/xinetd.conf
-       echo "      cps             = 25 30"            >> /var/ipfire/xinetd.conf
-       echo "}"                                                >> /var/ipfire/xinetd.conf
-       echo "# All service files are stored in the /var/ipfire/xinetd.d directory" >> /var/ipfire/xinetd.conf
-       echo "#"                                                >> /var/ipfire/xinetd.conf
-       echo "includedir /var/ipfire/xinetd.d"                  >> /var/ipfire/xinetd.conf
-       echo "# End /var/ipfire/xinetd"                                 >> /var/ipfire/xinetd.conf
+       cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd/xinetd.d
+       echo "# Begin /var/ipfire/xinetd/xinetd.conf"   >  /var/ipfire/xinetd/xinetd.conf
+       echo "# Configuration file for xinetd"          >> /var/ipfire/xinetd/xinetd.conf
+       echo "#"                                                >> /var/ipfire/xinetd/xinetd.conf
+       echo "defaults"                                         >> /var/ipfire/xinetd/xinetd.conf
+       echo "{"                                                >> /var/ipfire/xinetd/xinetd.conf
+       echo "      instances       = 60"                       >> /var/ipfire/xinetd/xinetd.conf
+       echo "      log_type        = SYSLOG daemon"    >> /var/ipfire/xinetd/xinetd.conf
+       echo "      log_on_success  = HOST PID USERID"  >> /var/ipfire/xinetd/xinetd.conf
+       echo "      log_on_failure  = HOST USERID"      >> /var/ipfire/xinetd/xinetd.conf
+       echo "      cps             = 25 30"            >> /var/ipfire/xinetd/xinetd.conf
+       echo "}"                                                >> /var/ipfire/xinetd/xinetd.conf
+       echo "# All service files are stored in the /var/ipfire/xinetd/xinetd.d directory" >> /var/ipfire/xinetd/xinetd.conf
+       echo "#"                                                >> /var/ipfire/xinetd/xinetd.conf
+       echo "includedir /var/ipfire/xinetd/xinetd.d"   >> /var/ipfire/xinetd/xinetd.conf
+       echo "# End /var/ipfire/xinetd/xinetd.conf"     >> /var/ipfire/xinetd/xinetd.conf
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)