Cleanup left over sources

diff --git a/lfs/directfb b/lfs/directfb
index 34acb593e48f5b979a441ea69b4080bfa0c29b50..1b5d3a9258695de7e257e9bc9362b85f35df8dce 100644 (file)
--- a/lfs/directfb
+++ b/lfs/directfb
@@ -88,5 +88,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        ln -s $(THISAPP) /usr/src/directfb
-#      @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 74947311fcbfbabf51e00071d6bf4f9f74ff2353..b3838865e82eb8f533874ef298823b7524005a3b 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -88,6 +88,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/ffmpeg && make install
        cd $(DIR_SRC)/ffmpeg && make install-libs
-       ldconfig
-#      @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/iptables b/lfs/iptables
index 5a1764be0a302c716d536e5c8d06c6d8960ea987..d3c8402b0756e0f230571c01acfb9a53f2489eff 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -83,7 +83,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-*
 
        @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 #      cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux
@@ -138,5 +138,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make install
 
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-*
        @$(POSTBUILD)

diff --git a/lfs/krb5 b/lfs/krb5
index 64eb670bda143a4273edd512a240bfe43dc95dff..68be46c8054e6a64053d73feeb017b5e9b54bb03 100644 (file)
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/mitkrb-1.12.1-db2_fix-1.patch
 
        cd $(DIR_APP) && sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \
@@ -101,5 +101,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                chmod -f -v 755 "/usr/lib/lib$$LIB.so"; \
        done
 
-       @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_SRC)/$(THISAPP)
        @$(POSTBUILD)

diff --git a/lfs/mISDNuser b/lfs/mISDNuser
index 4f4edd5aa865d65df3ce456c9cd6a0896eab2ef5..c471c760730f19a2dd2b2b6273c22c968d2f429c 100644 (file)
--- a/lfs/mISDNuser
+++ b/lfs/mISDNuser
@@ -74,4 +74,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/mISDNuser && ./configure --prefix=/usr --with-AF_ISDN=34
        cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux
        cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/nagios b/lfs/nagios
index 868272bb30f28cabef5f7ff3d4d6cbe46f841b22..1a88989d7ccb074ac910c696f3d2c736706406e7 100644 (file)
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -79,7 +79,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && \
                ./configure --prefix=/usr \
                        --sysconfdir=/etc/nagios \
@@ -110,5 +110,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios
        ln -s /etc/init.d/nagios /etc/rc.d/rc0.d/K33nagios
        ln -s /etc/init.d/nagios /etc/rc.d/rc6.d/K33nagios
-       @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins*
        @$(POSTBUILD)

diff --git a/lfs/owncloud b/lfs/owncloud
index 93ab3a58bdf5026997f3db0e29005b16f79f34a4..3cf8e3c45d8c913d413e3cba4a3190488957f01d 100644 (file)
--- a/lfs/owncloud
+++ b/lfs/owncloud
@@ -97,4 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                /etc/httpd/conf/vhosts.d/
        install -v -m 644 $(DIR_SRC)/config/backup/includes/owncloud \
                /var/ipfire/backup/addons/includes/owncloud
+
+       @rm -rf $(DIR_SRC)/$(PROG)
        @$(POSTBUILD)

diff --git a/lfs/xvid b/lfs/xvid
index f3cf00c8b9362d16f77048697642cf7f554e4799..abf03a52a7b24c747ae8cab21fb607c1eefb8da6 100644 (file)
--- a/lfs/xvid
+++ b/lfs/xvid
@@ -29,7 +29,7 @@ VER        = 1.2.1
 THISAPP    = xvidcore-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/xvidcore
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = xvid
 PAK_VER    = 2
@@ -77,9 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_SRC)/xvidcore/build/generic && ./configure --prefix=/usr
-       cd $(DIR_SRC)/xvidcore/build/generic && make
-       cd $(DIR_SRC)/xvidcore/build/generic && make install
+       cd $(DIR_APP)/build/generic && ./configure --prefix=/usr
+       cd $(DIR_APP)/build/generic && make
+       cd $(DIR_APP)/build/generic && make install
        chmod -v 755 /usr/lib/libxvidcore.so.4.2
        ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4
        ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so