diff options
426 files changed, 426 insertions, 426 deletions
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index dcfe63263..b5a6e3071 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -169,7 +169,7 @@ endif alsa-lib_clean: rm -rf $(STATEDIR)/alsa-lib.* - rm -rf $(IMAGEDIR)/alsa-lib_* + rm -rf $(PKGDIR)/alsa-lib_* rm -rf $(ALSA_LIB_DIR) # vim: syntax=make diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index 5171e310c..6000a6510 100644 --- a/rules/alsa-utils.make +++ b/rules/alsa-utils.make @@ -93,7 +93,7 @@ $(STATEDIR)/alsa-utils.targetinstall: alsa-utils_clean: rm -rf $(STATEDIR)/alsa-utils.* - rm -rf $(IMAGEDIR)/alsa-utils_* + rm -rf $(PKGDIR)/alsa-utils_* rm -rf $(ALSA_UTILS_DIR) # vim: syntax=make diff --git a/rules/apache2.make b/rules/apache2.make index 4f9a4674d..74c1140f2 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -347,7 +347,7 @@ endif apache2_clean: rm -rf $(STATEDIR)/apache2.* - rm -rf $(IMAGEDIR)/apache2_* + rm -rf $(PKGDIR)/apache2_* rm -rf $(APACHE2_DIR) # vim: syntax=make diff --git a/rules/apache2_mod_python.make b/rules/apache2_mod_python.make index c9717a18e..ac6782258 100644 --- a/rules/apache2_mod_python.make +++ b/rules/apache2_mod_python.make @@ -140,7 +140,7 @@ $(STATEDIR)/apache2_mod_python.targetinstall: $(apache2_mod_python_targetinstall apache2_mod_python_clean: rm -rf $(STATEDIR)/apache2_mod_python.* - rm -rf $(IMAGEDIR)/apache2_mod_python_* + rm -rf $(PKGDIR)/apache2_mod_python_* rm -rf $(APACHE2_MOD_PYTHON_DIR) # vim: syntax=make diff --git a/rules/argtable2.make b/rules/argtable2.make index 0fd3f6a59..0310b9574 100644 --- a/rules/argtable2.make +++ b/rules/argtable2.make @@ -127,7 +127,7 @@ $(STATEDIR)/argtable2.targetinstall: $(argtable2_targetinstall_deps_default) argtable2_clean: rm -rf $(STATEDIR)/argtable2.* - rm -rf $(IMAGEDIR)/argtable2_* + rm -rf $(PKGDIR)/argtable2_* rm -rf $(ARGTABLE2_DIR) # vim: syntax=make diff --git a/rules/atk.make b/rules/atk.make index 030d3abaa..1a6c4db2c 100644 --- a/rules/atk.make +++ b/rules/atk.make @@ -134,7 +134,7 @@ $(STATEDIR)/atk.targetinstall: atk_clean: rm -rf $(STATEDIR)/atk.* - rm -rf $(IMAGEDIR)/atk_* + rm -rf $(PKGDIR)/atk_* rm -rf $(ATK_DIR) # vim: syntax=make diff --git a/rules/attr.make b/rules/attr.make index e71faa746..0c4e8ac2a 100644 --- a/rules/attr.make +++ b/rules/attr.make @@ -131,7 +131,7 @@ $(STATEDIR)/attr.targetinstall: $(attr_targetinstall_deps_default) attr_clean: rm -rf $(STATEDIR)/attr.* - rm -rf $(IMAGEDIR)/attr_* + rm -rf $(PKGDIR)/attr_* rm -rf $(ATTR_DIR) # vim: syntax=make diff --git a/rules/bash.make b/rules/bash.make index b0e343963..78973cab7 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -249,7 +249,7 @@ $(STATEDIR)/bash.targetinstall: $(bash_targetinstall_deps_default) bash_clean: rm -rf $(STATEDIR)/bash.* - rm -rf $(IMAGEDIR)/bash_* + rm -rf $(PKGDIR)/bash_* rm -fr $(BASH_DIR) # vim: syntax=make diff --git a/rules/bing.make b/rules/bing.make index a2aaaa6b4..9dae5352b 100644 --- a/rules/bing.make +++ b/rules/bing.make @@ -116,7 +116,7 @@ $(STATEDIR)/bing.targetinstall: $(bing_targetinstall_deps_default) bing_clean: rm -rf $(STATEDIR)/bing.* - rm -rf $(IMAGEDIR)/bing_* + rm -rf $(PKGDIR)/bing_* rm -rf $(BING_DIR) # vim: syntax=make diff --git a/rules/binutils.make b/rules/binutils.make index 79fe02d63..ea7d8e542 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -92,7 +92,7 @@ endif binutils_clean: rm -rf $(STATEDIR)/binutils.* - rm -rf $(IMAGEDIR)/binutils_* + rm -rf $(PKGDIR)/binutils_* rm -rf $(BINUTILS_DIR) # vim: syntax=make diff --git a/rules/bluez-libs.make b/rules/bluez-libs.make index 48de87db2..7a237ab71 100644 --- a/rules/bluez-libs.make +++ b/rules/bluez-libs.make @@ -130,7 +130,7 @@ $(STATEDIR)/bluez-libs.targetinstall: $(bluez-libs_targetinstall_deps_default) bluez-libs_clean: rm -rf $(STATEDIR)/bluez-libs.* - rm -rf $(IMAGEDIR)/bluez-libs_* + rm -rf $(PKGDIR)/bluez-libs_* rm -rf $(BLUEZ_LIBS_DIR) # vim: syntax=make diff --git a/rules/bluez-utils.make b/rules/bluez-utils.make index 3b4edd0b4..f3b82942b 100644 --- a/rules/bluez-utils.make +++ b/rules/bluez-utils.make @@ -132,7 +132,7 @@ $(STATEDIR)/bluez-utils.targetinstall: $(bluez-utils_targetinstall_deps_default) bluez-utils_clean: rm -rf $(STATEDIR)/bluez-utils.* - rm -rf $(IMAGEDIR)/bluez-utils_* + rm -rf $(PKGDIR)/bluez-utils_* rm -rf $(BLUEZ_UTILS_DIR) # vim: syntax=make diff --git a/rules/bonniexx.make b/rules/bonniexx.make index 689344cfc..f6d753ca9 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -132,7 +132,7 @@ $(STATEDIR)/bonniexx.targetinstall: $(bonniexx_targetinstall_deps_default) bonniexx_clean: rm -rf $(STATEDIR)/bonniexx.* - rm -rf $(IMAGEDIR)/bonniexx_* + rm -rf $(PKGDIR)/bonniexx_* rm -rf $(BONNIEXX_DIR) # vim: syntax=make diff --git a/rules/boost.make b/rules/boost.make index 6aff25249..fd54e6f7a 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -225,7 +225,7 @@ endif boost_clean: rm -rf $(STATEDIR)/boost.* - rm -rf $(IMAGEDIR)/boost_* + rm -rf $(PKGDIR)/boost_* rm -rf $(BOOST_DIR) # vim: syntax=make diff --git a/rules/busybox.make b/rules/busybox.make index a30cd53cb..23e83e807 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -130,7 +130,7 @@ endif busybox_clean: rm -rf $(STATEDIR)/busybox.* - rm -rf $(IMAGEDIR)/busybox_* + rm -rf $(PKGDIR)/busybox_* rm -rf $(BUSYBOX_DIR) # vim: syntax=make diff --git a/rules/cairo.make b/rules/cairo.make index 80012897d..edfd0c923 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -180,7 +180,7 @@ $(STATEDIR)/cairo.targetinstall: cairo_clean: rm -rf $(STATEDIR)/cairo.* - rm -rf $(IMAGEDIR)/cairo_* + rm -rf $(PKGDIR)/cairo_* rm -rf $(CAIRO_DIR) # vim: syntax=make diff --git a/rules/cairomm.make b/rules/cairomm.make index 27f142b10..bb128043e 100644 --- a/rules/cairomm.make +++ b/rules/cairomm.make @@ -133,7 +133,7 @@ $(STATEDIR)/cairomm.targetinstall: $(cairomm_targetinstall_deps_default) cairomm_clean: rm -rf $(STATEDIR)/cairomm.* - rm -rf $(IMAGEDIR)/cairomm_* + rm -rf $(PKGDIR)/cairomm_* rm -rf $(CAIROMM_DIR) # vim: syntax=make diff --git a/rules/calibrator.make b/rules/calibrator.make index 6d4168265..d402fd16e 100644 --- a/rules/calibrator.make +++ b/rules/calibrator.make @@ -120,7 +120,7 @@ $(STATEDIR)/calibrator.targetinstall: $(calibrator_targetinstall_deps_default) calibrator_clean: rm -rf $(STATEDIR)/calibrator.* - rm -rf $(IMAGEDIR)/calibrator_* + rm -rf $(PKGDIR)/calibrator_* rm -rf $(CALIBRATOR_DIR) # vim: syntax=make diff --git a/rules/canutils.make b/rules/canutils.make index 5b78981a1..350b2788b 100644 --- a/rules/canutils.make +++ b/rules/canutils.make @@ -139,7 +139,7 @@ endif canutils_clean: rm -rf $(STATEDIR)/canutils.* - rm -rf $(IMAGEDIR)/canutils_* + rm -rf $(PKGDIR)/canutils_* rm -rf $(CANUTILS_DIR) # vim: syntax=make diff --git a/rules/chrony.make b/rules/chrony.make index f803d5c34..043f1923c 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -217,7 +217,7 @@ endif chrony_clean: rm -rf $(STATEDIR)/chrony.* - rm -rf $(IMAGEDIR)/chrony_* + rm -rf $(PKGDIR)/chrony_* rm -rf $(CHRONY_DIR) # vim: syntax=make diff --git a/rules/clock.make b/rules/clock.make index 591a303dc..b53dcb668 100644 --- a/rules/clock.make +++ b/rules/clock.make @@ -118,7 +118,7 @@ $(STATEDIR)/clock.targetinstall: $(clock_targetinstall_deps_default) clock_clean: rm -rf $(STATEDIR)/clock.* - rm -rf $(IMAGEDIR)/clock_* + rm -rf $(PKGDIR)/clock_* rm -rf $(CLOCK_DIR) # vim: syntax=make diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make index 83f513598..59879ebbc 100644 --- a/rules/commoncpp2.make +++ b/rules/commoncpp2.make @@ -147,7 +147,7 @@ $(STATEDIR)/commoncpp2.targetinstall: $(commoncpp2_targetinstall_deps_default) commoncpp2_clean: rm -rf $(STATEDIR)/commoncpp2.* - rm -rf $(IMAGEDIR)/commoncpp2_* + rm -rf $(PKGDIR)/commoncpp2_* rm -rf $(COMMONCPP2_DIR) # vim: syntax=make diff --git a/rules/cppunit.make b/rules/cppunit.make index 98059505c..dc2b0d178 100644 --- a/rules/cppunit.make +++ b/rules/cppunit.make @@ -132,7 +132,7 @@ $(STATEDIR)/cppunit.targetinstall: $(cppunit_targetinstall_deps_default) cppunit_clean: rm -rf $(STATEDIR)/cppunit.* - rm -rf $(IMAGEDIR)/cppunit_* + rm -rf $(PKGDIR)/cppunit_* rm -rf $(CPPUNIT_DIR) # vim: syntax=make diff --git a/rules/cpufrequtils.make b/rules/cpufrequtils.make index ef5b9f085..6402001a6 100644 --- a/rules/cpufrequtils.make +++ b/rules/cpufrequtils.make @@ -126,7 +126,7 @@ endif cpufrequtils_clean: rm -rf $(STATEDIR)/cpufrequtils.* - rm -rf $(IMAGEDIR)/cpufrequtils_* + rm -rf $(PKGDIR)/cpufrequtils_* rm -rf $(CPUFREQUTILS_DIR) # vim: syntax=make diff --git a/rules/cross-module-init-tools.make b/rules/cross-module-init-tools.make index d1bd6dabc..f27d4f421 100644 --- a/rules/cross-module-init-tools.make +++ b/rules/cross-module-init-tools.make @@ -96,7 +96,7 @@ $(STATEDIR)/cross-module-init-tools.install: $(cross-module-init-tools_install_d cross-module-init-tools_clean: rm -rf $(STATEDIR)/cross-module-init-tools.* - rm -rf $(IMAGEDIR)/cross-module-init-tools_* + rm -rf $(PKGDIR)/cross-module-init-tools_* rm -rf $(CROSS_MODULE_INIT_TOOLS_DIR) # vim: syntax=make diff --git a/rules/cross-pkg-config-wrapper.make b/rules/cross-pkg-config-wrapper.make index 8f710edf7..8456de568 100644 --- a/rules/cross-pkg-config-wrapper.make +++ b/rules/cross-pkg-config-wrapper.make @@ -79,7 +79,7 @@ $(STATEDIR)/cross-pkg-config-wrapper.install: $(cross-pkg-config-wrapper_install cross-pkg-config-wrapper_clean: rm -rf $(STATEDIR)/cross-pkg-config-wrapper.* - rm -rf $(IMAGEDIR)/cross-pkg-config-wrapper_* + rm -rf $(PKGDIR)/cross-pkg-config-wrapper_* rm -rf $(CROSS_PKG_CONFIG_WRAPPER_DIR) # vim: syntax=make diff --git a/rules/cvs.make b/rules/cvs.make index 0f1a4d2ca..c017518a2 100644 --- a/rules/cvs.make +++ b/rules/cvs.make @@ -245,7 +245,7 @@ endif cvs_clean: rm -rf $(STATEDIR)/cvs.* - rm -rf $(IMAGEDIR)/cvs_* + rm -rf $(PKGDIR)/cvs_* rm -rf $(CVS_DIR) # vim: syntax=make diff --git a/rules/cyclictest.make b/rules/cyclictest.make index 0cd4c45d6..c7e850fe7 100644 --- a/rules/cyclictest.make +++ b/rules/cyclictest.make @@ -131,7 +131,7 @@ $(STATEDIR)/cyclictest.targetinstall: $(cyclictest_targetinstall_deps_default) cyclictest_clean: rm -rf $(STATEDIR)/cyclictest.* - rm -rf $(IMAGEDIR)/cyclictest_* + rm -rf $(PKGDIR)/cyclictest_* rm -rf $(CYCLICTEST_DIR) # vim: syntax=make diff --git a/rules/daemonize.make b/rules/daemonize.make index 2cb32e9d7..95aa1c1d9 100644 --- a/rules/daemonize.make +++ b/rules/daemonize.make @@ -126,7 +126,7 @@ $(STATEDIR)/daemonize.targetinstall: $(daemonize_targetinstall_deps_default) daemonize_clean: rm -rf $(STATEDIR)/daemonize.* - rm -rf $(IMAGEDIR)/daemonize_* + rm -rf $(PKGDIR)/daemonize_* rm -rf $(DAEMONIZE_DIR) # vim: syntax=make diff --git a/rules/dash.make b/rules/dash.make index 2b2efe073..5b8342425 100644 --- a/rules/dash.make +++ b/rules/dash.make @@ -75,7 +75,7 @@ $(STATEDIR)/dash.targetinstall: dash_clean: rm -rf $(STATEDIR)/dash.* - rm -rf $(IMAGEDIR)/dash_* + rm -rf $(PKGDIR)/dash_* rm -rf $(DASH_DIR) # vim: syntax=make diff --git a/rules/db41.make b/rules/db41.make index 5cbbb6860..cbd294365 100644 --- a/rules/db41.make +++ b/rules/db41.make @@ -135,7 +135,7 @@ $(STATEDIR)/db41.targetinstall: $(db41_targetinstall_deps_default) db41_clean: rm -rf $(STATEDIR)/db41.* - rm -rf $(IMAGEDIR)/db41_* + rm -rf $(PKGDIR)/db41_* rm -rf $(DB41_DIR) # vim: syntax=make diff --git a/rules/db44.make b/rules/db44.make index f1733b295..228c19b39 100644 --- a/rules/db44.make +++ b/rules/db44.make @@ -166,7 +166,7 @@ $(STATEDIR)/db44.targetinstall: $(db44_targetinstall_deps_default) db44_clean: rm -rf $(STATEDIR)/db44.* - rm -rf $(IMAGEDIR)/db44_* + rm -rf $(PKGDIR)/db44_* rm -rf $(DB44_DIR) # vim: syntax=make diff --git a/rules/dbench.make b/rules/dbench.make index ebd1189c9..df7eab86e 100644 --- a/rules/dbench.make +++ b/rules/dbench.make @@ -141,7 +141,7 @@ endif dbench_clean: rm -rf $(STATEDIR)/dbench.* - rm -rf $(IMAGEDIR)/dbench_* + rm -rf $(PKGDIR)/dbench_* rm -rf $(DBENCH_DIR) # vim: syntax=make diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make index 8ecdb7160..a6b088ba6 100644 --- a/rules/dbus-glib.make +++ b/rules/dbus-glib.make @@ -91,7 +91,7 @@ $(STATEDIR)/dbus-glib.targetinstall: dbus-glib_clean: rm -rf $(STATEDIR)/dbus-glib.* - rm -rf $(IMAGEDIR)/dbus-glib_* + rm -rf $(PKGDIR)/dbus-glib_* rm -rf $(DBUS_GLIB_DIR) # vim: syntax=make diff --git a/rules/dbus.make b/rules/dbus.make index 937935969..a00380f6b 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -191,7 +191,7 @@ endif dbus_clean: rm -rf $(STATEDIR)/dbus.* - rm -rf $(IMAGEDIR)/dbus_* + rm -rf $(PKGDIR)/dbus_* rm -rf $(DBUS_DIR) # vim: syntax=make diff --git a/rules/dhcp.make b/rules/dhcp.make index e7af57e49..06907b65d 100644 --- a/rules/dhcp.make +++ b/rules/dhcp.make @@ -148,7 +148,7 @@ endif dhcp_clean: rm -rf $(STATEDIR)/dhcp.* - rm -rf $(IMAGEDIR)/dhcp_* + rm -rf $(PKGDIR)/dhcp_* rm -rf $(DHCP_DIR) # vim: syntax=make diff --git a/rules/diffutils.make b/rules/diffutils.make index 93f416051..48f862d2c 100644 --- a/rules/diffutils.make +++ b/rules/diffutils.make @@ -137,7 +137,7 @@ endif diffutils_clean: rm -rf $(STATEDIR)/diffutils.* - rm -rf $(IMAGEDIR)/diffutils_* + rm -rf $(PKGDIR)/diffutils_* rm -rf $(DIFFUTILS_DIR) # vim: syntax=make diff --git a/rules/directfb-examples.make b/rules/directfb-examples.make index 4a8d1ac16..c2eeff34c 100644 --- a/rules/directfb-examples.make +++ b/rules/directfb-examples.make @@ -134,7 +134,7 @@ endif directfb-examples_clean: rm -rf $(STATEDIR)/directfb-examples.* - rm -rf $(IMAGEDIR)/directfb-examples_* + rm -rf $(PKGDIR)/directfb-examples_* rm -rf $(DIRECTFB_EXAMPLES_DIR) # vim: syntax=make diff --git a/rules/directfb.make b/rules/directfb.make index 3a2470409..225bd9fc3 100644 --- a/rules/directfb.make +++ b/rules/directfb.make @@ -246,7 +246,7 @@ endif directfb_clean: rm -rf $(STATEDIR)/directfb.* - rm -rf $(IMAGEDIR)/directfb_* + rm -rf $(PKGDIR)/directfb_* rm -rf $(DIRECTFB_DIR) # vim: syntax=make diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index a1a234f62..8118ba316 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -169,7 +169,7 @@ endif dnsmasq_clean: rm -rf $(STATEDIR)/dnsmasq.* - rm -rf $(IMAGEDIR)/dnsmasq_* + rm -rf $(PKGDIR)/dnsmasq_* rm -rf $(DNSMASQ_DIR) # vim: syntax=make diff --git a/rules/dosfstools.make b/rules/dosfstools.make index ceb7a541b..334f1db97 100644 --- a/rules/dosfstools.make +++ b/rules/dosfstools.make @@ -130,7 +130,7 @@ endif dosfstools_clean: rm -rf $(STATEDIR)/dosfstools.* - rm -rf $(IMAGEDIR)/dosfstools_* + rm -rf $(PKGDIR)/dosfstools_* rm -rf $(DOSFSTOOLS_DIR) # vim: syntax=make diff --git a/rules/dropbear.make b/rules/dropbear.make index 96f5754f7..1fbd3b1dd 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -338,7 +338,7 @@ endif dropbear_clean: rm -rf $(STATEDIR)/dropbear.* - rm -rf $(IMAGEDIR)/dropbear_* + rm -rf $(PKGDIR)/dropbear_* rm -rf $(DROPBEAR_DIR) # vim: syntax=make diff --git a/rules/dtc.make b/rules/dtc.make index ed247f91f..3a3106d97 100644 --- a/rules/dtc.make +++ b/rules/dtc.make @@ -71,7 +71,7 @@ $(STATEDIR)/dtc.targetinstall: dtc_clean: rm -rf $(STATEDIR)/dtc.* - rm -rf $(IMAGEDIR)/dtc_* + rm -rf $(PKGDIR)/dtc_* rm -rf $(DTC_DIR) # vim: syntax=make diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 5839b0913..339e8e953 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -97,7 +97,7 @@ endif e2fsprogs_clean: rm -rf $(STATEDIR)/e2fsprogs.* - rm -rf $(IMAGEDIR)/e2fsprogs_* + rm -rf $(PKGDIR)/e2fsprogs_* rm -rf $(E2FSPROGS_DIR) # vim: syntax=make diff --git a/rules/efax.make b/rules/efax.make index 7ef812909..26bdf8f9a 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -125,7 +125,7 @@ $(STATEDIR)/efax.targetinstall: $(efax_targetinstall_deps_default) efax_clean: rm -rf $(STATEDIR)/efax.* - rm -rf $(IMAGEDIR)/efax_* + rm -rf $(PKGDIR)/efax_* rm -rf $(EFAX_DIR) # vim: syntax=make diff --git a/rules/etherwake.make b/rules/etherwake.make index 2423864f1..36ff1dc7a 100644 --- a/rules/etherwake.make +++ b/rules/etherwake.make @@ -121,7 +121,7 @@ $(STATEDIR)/etherwake.targetinstall: $(etherwake_targetinstall_deps_default) etherwake_clean: rm -rf $(STATEDIR)/etherwake.* - rm -rf $(IMAGEDIR)/etherwake_* + rm -rf $(PKGDIR)/etherwake_* rm -rf $(ETHERWAKE_DIR) # vim: syntax=make diff --git a/rules/ethtool.make b/rules/ethtool.make index d93a6c104..52a157bea 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -124,7 +124,7 @@ $(STATEDIR)/ethtool.targetinstall: $(ethtool_targetinstall_deps_default) ethtool_clean: rm -rf $(STATEDIR)/ethtool.* - rm -rf $(IMAGEDIR)/ethtool_* + rm -rf $(PKGDIR)/ethtool_* rm -rf $(ETHTOOL_DIR) # vim: syntax=make diff --git a/rules/eventlog.make b/rules/eventlog.make index c383468b5..67d33e477 100644 --- a/rules/eventlog.make +++ b/rules/eventlog.make @@ -82,7 +82,7 @@ $(STATEDIR)/eventlog.targetinstall: eventlog_clean: rm -rf $(STATEDIR)/eventlog.* - rm -rf $(IMAGEDIR)/eventlog_* + rm -rf $(PKGDIR)/eventlog_* rm -rf $(EVENTLOG_DIR) # vim: syntax=make diff --git a/rules/expat.make b/rules/expat.make index c6b796859..fe33a7c1e 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -129,7 +129,7 @@ $(STATEDIR)/expat.targetinstall: expat_clean: rm -rf $(STATEDIR)/expat.* - rm -rf $(IMAGEDIR)/expat_* + rm -rf $(PKGDIR)/expat_* rm -rf $(EXPAT_DIR) # vim: syntax=make diff --git a/rules/fam.make b/rules/fam.make index 97856b84d..65ce0eb30 100644 --- a/rules/fam.make +++ b/rules/fam.make @@ -164,7 +164,7 @@ endif fam_clean: rm -rf $(STATEDIR)/fam.* - rm -rf $(IMAGEDIR)/fam_* + rm -rf $(PKGDIR)/fam_* rm -rf $(FAM_DIR) # vim: syntax=make diff --git a/rules/fbgrab.make b/rules/fbgrab.make index 11e91d2d5..1ef5cc780 100644 --- a/rules/fbgrab.make +++ b/rules/fbgrab.make @@ -128,7 +128,7 @@ $(STATEDIR)/fbgrab.targetinstall: $(fbgrab_targetinstall_deps_default) fbgrab_clean: rm -rf $(STATEDIR)/fbgrab.* - rm -rf $(IMAGEDIR)/fbgrab_* + rm -rf $(PKGDIR)/fbgrab_* rm -rf $(FBGRAB_DIR) # vim: syntax=make diff --git a/rules/fbtest.make b/rules/fbtest.make index 27ea28659..707db56bc 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -118,7 +118,7 @@ $(STATEDIR)/fbtest.targetinstall: $(fbtest_targetinstall_deps_default) fbtest_clean: rm -rf $(STATEDIR)/fbtest.* - rm -rf $(IMAGEDIR)/fbtest_* + rm -rf $(PKGDIR)/fbtest_* rm -rf $(FBTEST_DIR) # vim: syntax=make diff --git a/rules/fbutils.make b/rules/fbutils.make index d6c9ca909..c378f3027 100644 --- a/rules/fbutils.make +++ b/rules/fbutils.make @@ -129,7 +129,7 @@ endif fbutils_clean: rm -rf $(STATEDIR)/fbutils.* - rm -rf $(IMAGEDIR)/fbutils_* + rm -rf $(PKGDIR)/fbutils_* rm -rf $(FBUTILS_DIR) # vim: syntax=make diff --git a/rules/fcgi.make b/rules/fcgi.make index 3eb756625..9fc7d9c42 100644 --- a/rules/fcgi.make +++ b/rules/fcgi.make @@ -123,7 +123,7 @@ $(STATEDIR)/fcgi.targetinstall: $(fcgi_targetinstall_deps_default) fcgi_clean: rm -rf $(STATEDIR)/fcgi.* - rm -rf $(IMAGEDIR)/fcgi_* + rm -rf $(PKGDIR)/fcgi_* rm -rf $(FCGI_DIR) # vim: syntax=make diff --git a/rules/ffmpeg.make b/rules/ffmpeg.make index b935d4259..3c48d019d 100644 --- a/rules/ffmpeg.make +++ b/rules/ffmpeg.make @@ -510,7 +510,7 @@ endif ffmpeg_clean: rm -rf $(STATEDIR)/ffmpeg.* - rm -rf $(IMAGEDIR)/ffmpeg_* + rm -rf $(PKGDIR)/ffmpeg_* rm -rf $(FFMPEG_DIR) # vim: syntax=make diff --git a/rules/fftw.make b/rules/fftw.make index df37be2c0..caa7d45df 100644 --- a/rules/fftw.make +++ b/rules/fftw.make @@ -129,7 +129,7 @@ $(STATEDIR)/fftw.targetinstall: $(fftw_targetinstall_deps_default) fftw_clean: rm -rf $(STATEDIR)/fftw.* - rm -rf $(IMAGEDIR)/fftw_* + rm -rf $(PKGDIR)/fftw_* rm -rf $(FFTW_DIR) # vim: syntax=make diff --git a/rules/figlet.make b/rules/figlet.make index 37b1636b7..387a3966d 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -123,7 +123,7 @@ $(STATEDIR)/figlet.targetinstall: $(figlet_targetinstall_deps_default) figlet_clean: rm -rf $(STATEDIR)/figlet.* - rm -rf $(IMAGEDIR)/figlet_* + rm -rf $(PKGDIR)/figlet_* rm -rf $(FIGLET_DIR) # vim: syntax=make diff --git a/rules/findutils.make b/rules/findutils.make index e98233b2d..dccfd9c4a 100644 --- a/rules/findutils.make +++ b/rules/findutils.make @@ -145,7 +145,7 @@ endif findutils_clean: rm -rf $(STATEDIR)/findutils.* - rm -rf $(IMAGEDIR)/findutils_* + rm -rf $(PKGDIR)/findutils_* rm -rf $(FINDUTILS_DIR) # vim: syntax=make diff --git a/rules/fontconfig.make b/rules/fontconfig.make index 70c49f102..b337e23eb 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -171,7 +171,7 @@ endif fontconfig_clean: rm -rf $(STATEDIR)/fontconfig.* - rm -rf $(IMAGEDIR)/fontconfig_* + rm -rf $(PKGDIR)/fontconfig_* rm -rf $(FONTCONFIG_DIR) # vim: syntax=make diff --git a/rules/freetype.make b/rules/freetype.make index 501241c9e..947746f1f 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -132,7 +132,7 @@ $(STATEDIR)/freetype.targetinstall: freetype_clean: rm -rf $(STATEDIR)/freetype.* - rm -rf $(IMAGEDIR)/freetype_* + rm -rf $(PKGDIR)/freetype_* rm -rf $(FREETYPE_DIR) # vim: syntax=make diff --git a/rules/frodo.make b/rules/frodo.make index a7428e214..c8a06128d 100644 --- a/rules/frodo.make +++ b/rules/frodo.make @@ -102,7 +102,7 @@ $(STATEDIR)/frodo.targetinstall: frodo_clean: rm -rf $(STATEDIR)/frodo.* - rm -rf $(IMAGEDIR)/frodo_* + rm -rf $(PKGDIR)/frodo_* rm -rf $(FRODO_DIR) # vim: syntax=make diff --git a/rules/fuse.make b/rules/fuse.make index d09410913..10b3bc5f0 100644 --- a/rules/fuse.make +++ b/rules/fuse.make @@ -134,7 +134,7 @@ $(STATEDIR)/fuse.targetinstall: $(fuse_targetinstall_deps_default) fuse_clean: rm -rf $(STATEDIR)/fuse.* - rm -rf $(IMAGEDIR)/fuse_* + rm -rf $(PKGDIR)/fuse_* rm -rf $(FUSE_DIR) # vim: syntax=make diff --git a/rules/gdb.make b/rules/gdb.make index dabad6d3e..7b7a6516c 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -117,6 +117,6 @@ $(STATEDIR)/gdb.targetinstall: gdb_clean: rm -rf $(STATEDIR)/gdb.* $(GDB_DIR) - rm -rf $(IMAGEDIR)/gdb_* + rm -rf $(PKGDIR)/gdb_* # vim: syntax=make diff --git a/rules/gdbserver.make b/rules/gdbserver.make index d93018f5d..07a33b2ae 100644 --- a/rules/gdbserver.make +++ b/rules/gdbserver.make @@ -106,6 +106,6 @@ $(STATEDIR)/gdbserver.targetinstall: gdbserver_clean: rm -rf $(STATEDIR)/gdbserver.* $(GDBSERVER_BUILDDIR) - rm -rf $(IMAGEDIR)/gdbserver_* + rm -rf $(PKGDIR)/gdbserver_* # vim: syntax=make diff --git a/rules/gettext-dummy.make b/rules/gettext-dummy.make index feffcadae..5f6414478 100644 --- a/rules/gettext-dummy.make +++ b/rules/gettext-dummy.make @@ -77,7 +77,7 @@ $(STATEDIR)/gettext-dummy.targetinstall: gettext-dummy_clean: rm -rf $(STATEDIR)/gettext-dummy.* - rm -rf $(IMAGEDIR)/gettext-dummy_* + rm -rf $(PKGDIR)/gettext-dummy_* rm -rf $(GETTEXT_DUMMY_DIR) # vim: syntax=make diff --git a/rules/gettext.make b/rules/gettext.make index e2406fce3..a8b5b48e8 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -135,7 +135,7 @@ $(STATEDIR)/gettext.targetinstall: gettext_clean: rm -rf $(STATEDIR)/gettext.* - rm -rf $(IMAGEDIR)/gettext_* + rm -rf $(PKGDIR)/gettext_* rm -rf $(GETTEXT_DIR) # vim: syntax=make diff --git a/rules/glade.make b/rules/glade.make index cad1860ff..07d94b742 100644 --- a/rules/glade.make +++ b/rules/glade.make @@ -129,7 +129,7 @@ $(STATEDIR)/glade.targetinstall: $(glade_targetinstall_deps_default) glade_clean: rm -rf $(STATEDIR)/glade.* - rm -rf $(IMAGEDIR)/glade_* + rm -rf $(PKGDIR)/glade_* rm -rf $(GLADE_DIR) # vim: syntax=make diff --git a/rules/glademm.make b/rules/glademm.make index b37fcdb9e..20bf1ea70 100644 --- a/rules/glademm.make +++ b/rules/glademm.make @@ -131,7 +131,7 @@ $(STATEDIR)/glademm.targetinstall: $(glademm_targetinstall_deps_default) glademm_clean: rm -rf $(STATEDIR)/glademm.* - rm -rf $(IMAGEDIR)/glademm_* + rm -rf $(PKGDIR)/glademm_* rm -rf $(GLADEMM_DIR) # vim: syntax=make diff --git a/rules/glib.make b/rules/glib.make index 4d7bdf1b7..457d44cb6 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -107,7 +107,7 @@ $(STATEDIR)/glib.targetinstall: glib_clean: rm -rf $(STATEDIR)/glib.* - rm -rf $(IMAGEDIR)/glib_* + rm -rf $(PKGDIR)/glib_* rm -rf $(GLIB_DIR) # vim: syntax=make diff --git a/rules/glibmm.make b/rules/glibmm.make index 38cab6ec8..3f551773e 100644 --- a/rules/glibmm.make +++ b/rules/glibmm.make @@ -133,7 +133,7 @@ $(STATEDIR)/glibmm.targetinstall: $(glibmm_targetinstall_deps_default) glibmm_clean: rm -rf $(STATEDIR)/glibmm.* - rm -rf $(IMAGEDIR)/glibmm_* + rm -rf $(PKGDIR)/glibmm_* rm -rf $(GLIBMM_DIR) # vim: syntax=make diff --git a/rules/gmake.make b/rules/gmake.make index d9cbd0851..b5db2ac60 100644 --- a/rules/gmake.make +++ b/rules/gmake.make @@ -129,7 +129,7 @@ $(STATEDIR)/gmake.targetinstall: gmake_clean: rm -rf $(STATEDIR)/gmake.* - rm -rf $(IMAGEDIR)/gmake_* + rm -rf $(PKGDIR)/gmake_* rm -rf $(GMAKE_DIR) # vim: syntax=make diff --git a/rules/gnupg.make b/rules/gnupg.make index cb66077b1..bc2ee563c 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -150,7 +150,7 @@ $(STATEDIR)/gnupg.targetinstall: $(gnupg_targetinstall_deps_default) gnupg_clean: rm -rf $(STATEDIR)/gnupg.* - rm -rf $(IMAGEDIR)/gnupg_* + rm -rf $(PKGDIR)/gnupg_* rm -rf $(GNUPG_DIR) # vim: syntax=make diff --git a/rules/gnuplot.make b/rules/gnuplot.make index f8651aa51..aefae648d 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -194,7 +194,7 @@ endif gnuplot_clean: rm -rf $(STATEDIR)/gnuplot.* - rm -rf $(IMAGEDIR)/gnuplot_* + rm -rf $(PKGDIR)/gnuplot_* rm -rf $(GNUPLOT_DIR) # vim: syntax=make diff --git a/rules/grub.make b/rules/grub.make index 7fb9cb888..b75cfa1eb 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -489,7 +489,7 @@ endif grub_clean: rm -rf $(STATEDIR)/grub.* - rm -rf $(IMAGEDIR)/grub_* + rm -rf $(PKGDIR)/grub_* rm -rf $(GRUB_DIR) # vim: syntax=make diff --git a/rules/gtk-engine-experience.make b/rules/gtk-engine-experience.make index 42ac2d94e..f2d9c81a0 100644 --- a/rules/gtk-engine-experience.make +++ b/rules/gtk-engine-experience.make @@ -130,7 +130,7 @@ $(STATEDIR)/gtk-engine-experience.targetinstall: gtk-engine-experience_clean: rm -rf $(STATEDIR)/gtk-engine-experience.* - rm -rf $(IMAGEDIR)/gtk-engine-experience_* + rm -rf $(PKGDIR)/gtk-engine-experience_* rm -rf $(GTK_ENGINE_EXPERIENCE_DIR) # vim: syntax=make diff --git a/rules/gtk-theme-experience.make b/rules/gtk-theme-experience.make index 6046c4a52..43f8aa104 100644 --- a/rules/gtk-theme-experience.make +++ b/rules/gtk-theme-experience.make @@ -167,7 +167,7 @@ endif gtk-theme-experience_clean: rm -rf $(STATEDIR)/gtk-theme-experience.* - rm -rf $(IMAGEDIR)/gtk-theme-experience_* + rm -rf $(PKGDIR)/gtk-theme-experience_* rm -rf $(GTK_THEME_EXPERIENCE_DIR) # vim: syntax=make diff --git a/rules/gtk.make b/rules/gtk.make index 1bc4f1575..8e955b8ea 100644 --- a/rules/gtk.make +++ b/rules/gtk.make @@ -252,7 +252,7 @@ endif gtk_clean: rm -rf $(STATEDIR)/gtk.* - rm -rf $(IMAGEDIR)/gtk_* + rm -rf $(PKGDIR)/gtk_* rm -rf $(GTK_DIR) # vim: syntax=make diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make index 80c637ba7..0d9157f4e 100644 --- a/rules/gtk2-engines.make +++ b/rules/gtk2-engines.make @@ -134,7 +134,7 @@ $(STATEDIR)/gtk2-engines.targetinstall: $(gtk2-engines_targetinstall_deps_defaul gtk2-engines_clean: rm -rf $(STATEDIR)/gtk2-engines.* - rm -rf $(IMAGEDIR)/gtk2-engines_* + rm -rf $(PKGDIR)/gtk2-engines_* rm -rf $(GTK2-ENGINES_DIR) # vim: syntax=make diff --git a/rules/gtkmm.make b/rules/gtkmm.make index 4e15e43c6..4989d638d 100644 --- a/rules/gtkmm.make +++ b/rules/gtkmm.make @@ -163,7 +163,7 @@ $(STATEDIR)/gtkmm.targetinstall: $(gtkmm_targetinstall_deps_default) gtkmm_clean: rm -rf $(STATEDIR)/gtkmm.* - rm -rf $(IMAGEDIR)/gtkmm_* + rm -rf $(PKGDIR)/gtkmm_* rm -rf $(GTKMM_DIR) # vim: syntax=make diff --git a/rules/gwt.make b/rules/gwt.make index d09545f58..82ee0557f 100644 --- a/rules/gwt.make +++ b/rules/gwt.make @@ -141,7 +141,7 @@ endif gwt_clean: rm -rf $(STATEDIR)/gwt.* - rm -rf $(IMAGEDIR)/gwt_* + rm -rf $(PKGDIR)/gwt_* rm -rf $(GWT_DIR) # vim: syntax=make diff --git a/rules/hackbench.make b/rules/hackbench.make index d7b809a56..6798aa1b3 100644 --- a/rules/hackbench.make +++ b/rules/hackbench.make @@ -120,7 +120,7 @@ $(STATEDIR)/hackbench.targetinstall: $(hackbench_targetinstall_deps_default) hackbench_clean: rm -rf $(STATEDIR)/hackbench.* - rm -rf $(IMAGEDIR)/hackbench_* + rm -rf $(PKGDIR)/hackbench_* rm -rf $(HACKBENCH_DIR) # vim: syntax=make diff --git a/rules/haserl.make b/rules/haserl.make index 193304041..b18c42730 100644 --- a/rules/haserl.make +++ b/rules/haserl.make @@ -123,7 +123,7 @@ $(STATEDIR)/haserl.targetinstall: $(haserl_targetinstall_deps_default) haserl_clean: rm -rf $(STATEDIR)/haserl.* - rm -rf $(IMAGEDIR)/haserl_* + rm -rf $(PKGDIR)/haserl_* rm -rf $(HASERL_DIR) # vim: syntax=make diff --git a/rules/hdparm.make b/rules/hdparm.make index f991c4b76..1c95178f5 100644 --- a/rules/hdparm.make +++ b/rules/hdparm.make @@ -122,7 +122,7 @@ $(STATEDIR)/hdparm.targetinstall: $(hdparm_targetinstall_deps_default) hdparm_clean: rm -rf $(STATEDIR)/hdparm.* - rm -rf $(IMAGEDIR)/hdparm_* + rm -rf $(PKGDIR)/hdparm_* rm -rf $(HDPARM_DIR) # vim: syntax=make diff --git a/rules/hexedit.make b/rules/hexedit.make index 6b22ea95b..26769d2cb 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -127,7 +127,7 @@ $(STATEDIR)/hexedit.targetinstall: $(hexedit_targetinstall_deps_default) hexedit_clean: rm -rf $(STATEDIR)/hexedit.* - rm -rf $(IMAGEDIR)/hexedit_* + rm -rf $(PKGDIR)/hexedit_* rm -rf $(HEXEDIT_DIR) # vim: syntax=make diff --git a/rules/hotplug.make b/rules/hotplug.make index 351ab366d..7c19da090 100644 --- a/rules/hotplug.make +++ b/rules/hotplug.make @@ -160,7 +160,7 @@ endif hotplug_clean: rm -rf $(STATEDIR)/hotplug.* - rm -rf $(IMAGEDIR)/hotplug_* + rm -rf $(PKGDIR)/hotplug_* rm -rf $(HOTPLUG_DIR) # vim: syntax=make diff --git a/rules/hpanel.make b/rules/hpanel.make index 7837bb4cc..107403710 100644 --- a/rules/hpanel.make +++ b/rules/hpanel.make @@ -126,7 +126,7 @@ $(STATEDIR)/hpanel.targetinstall: $(hpanel_targetinstall_deps_default) hpanel_clean: rm -rf $(STATEDIR)/hpanel.* - rm -rf $(IMAGEDIR)/hpanel_* + rm -rf $(PKGDIR)/hpanel_* rm -rf $(HPANEL_DIR) # vim: syntax=make diff --git a/rules/hrtimers-support.make b/rules/hrtimers-support.make index a235aaf6c..0af05093b 100644 --- a/rules/hrtimers-support.make +++ b/rules/hrtimers-support.make @@ -136,7 +136,7 @@ $(STATEDIR)/hrtimers-support.targetinstall: $(hrtimers-support_targetinstall_dep hrtimers-support_clean: rm -rf $(STATEDIR)/hrtimers-support.* - rm -rf $(IMAGEDIR)/hrtimers-support_* + rm -rf $(PKGDIR)/hrtimers-support_* rm -rf $(HRTIMERS_SUPPORT_DIR) # vim: syntax=make diff --git a/rules/i2c-tools.make b/rules/i2c-tools.make index 12ccdebf8..877d6d8c7 100644 --- a/rules/i2c-tools.make +++ b/rules/i2c-tools.make @@ -85,7 +85,7 @@ $(STATEDIR)/i2c-tools.targetinstall: i2c-tools_clean: rm -rf $(STATEDIR)/i2c-tools.* - rm -rf $(IMAGEDIR)/i2c-tools_* + rm -rf $(PKGDIR)/i2c-tools_* rm -rf $(I2C_TOOLS_DIR) # vim: syntax=make diff --git a/rules/i855resolution.make b/rules/i855resolution.make index 9ce0682e5..ff312c8b6 100644 --- a/rules/i855resolution.make +++ b/rules/i855resolution.make @@ -121,7 +121,7 @@ $(STATEDIR)/i855resolution.targetinstall: $(i855resolution_targetinstall_deps_de i855resolution_clean: rm -rf $(STATEDIR)/i855resolution.* - rm -rf $(IMAGEDIR)/i855resolution_* + rm -rf $(PKGDIR)/i855resolution_* rm -rf $(I855RESOLUTION_DIR) # vim: syntax=make diff --git a/rules/i915resolution.make b/rules/i915resolution.make index 3dde84ff8..a21747d1f 100644 --- a/rules/i915resolution.make +++ b/rules/i915resolution.make @@ -121,7 +121,7 @@ $(STATEDIR)/i915resolution.targetinstall: $(i915resolution_targetinstall_deps_de i915resolution_clean: rm -rf $(STATEDIR)/i915resolution.* - rm -rf $(IMAGEDIR)/i915resolution_* + rm -rf $(PKGDIR)/i915resolution_* rm -rf $(I915RESOLUTION_DIR) # vim: syntax=make diff --git a/rules/ifplugd.make b/rules/ifplugd.make index e075e9c5d..f02884223 100644 --- a/rules/ifplugd.make +++ b/rules/ifplugd.make @@ -134,7 +134,7 @@ endif ifplugd_clean: rm -rf $(STATEDIR)/ifplugd.* - rm -rf $(IMAGEDIR)/ifplugd_* + rm -rf $(PKGDIR)/ifplugd_* rm -rf $(IFPLUGD_DIR) # vim: syntax=make diff --git a/rules/inetutils.make b/rules/inetutils.make index 87a8cd62a..82419ebec 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -293,7 +293,7 @@ endif inetutils_clean: rm -rf $(STATEDIR)/inetutils.* - rm -rf $(IMAGEDIR)/inetutils_* + rm -rf $(PKGDIR)/inetutils_* rm -rf $(INETUTILS_DIR) # vim: syntax=make diff --git a/rules/initng.make b/rules/initng.make index b850dcaad..6309de4b6 100644 --- a/rules/initng.make +++ b/rules/initng.make @@ -638,7 +638,7 @@ endif initng_clean: rm -rf $(STATEDIR)/initng.* - rm -rf $(IMAGEDIR)/initng_* + rm -rf $(PKGDIR)/initng_* rm -rf $(INITNG_DIR) # vim: syntax=make diff --git a/rules/inotify-tools.make b/rules/inotify-tools.make index 6ff778929..45cf7b066 100644 --- a/rules/inotify-tools.make +++ b/rules/inotify-tools.make @@ -141,6 +141,6 @@ $(STATEDIR)/inotify-tools.targetinstall: $(inotify-tools_targetinstall_deps_defa inotify-tools_clean: rm -rf $(STATEDIR)/inotify-tools.* - rm -rf $(IMAGEDIR)/inotify-tools_* + rm -rf $(PKGDIR)/inotify-tools_* rm -rf $(INOTIFY_TOOLS_DIR) diff --git a/rules/iperf.make b/rules/iperf.make index a37ca1f53..29c7bca5b 100644 --- a/rules/iperf.make +++ b/rules/iperf.make @@ -125,7 +125,7 @@ $(STATEDIR)/iperf.targetinstall: $(iperf_targetinstall_deps_default) iperf_clean: rm -rf $(STATEDIR)/iperf.* - rm -rf $(IMAGEDIR)/iperf_* + rm -rf $(PKGDIR)/iperf_* rm -rf $(IPERF_DIR) # vim: syntax=make diff --git a/rules/ipkg.make b/rules/ipkg.make index d063e10a6..5184ff36a 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -146,7 +146,7 @@ endif ipkg_clean: rm -rf $(STATEDIR)/ipkg.* - rm -rf $(IMAGEDIR)/ipkg_* + rm -rf $(PKGDIR)/ipkg_* rm -rf $(IPKG_DIR) # vim: syntax=make diff --git a/rules/iproute2.make b/rules/iproute2.make index 343cb7fb5..4fc7f5fca 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -183,7 +183,7 @@ $(STATEDIR)/iproute2.targetinstall: $(iproute2_targetinstall_deps_default) iproute2_clean: rm -rf $(STATEDIR)/iproute2.* - rm -rf $(IMAGEDIR)/iproute2_* + rm -rf $(PKGDIR)/iproute2_* rm -rf $(IPROUTE2_DIR) # vim: syntax=make diff --git a/rules/iptables.make b/rules/iptables.make index 45c050979..715c4b6d4 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -503,7 +503,7 @@ endif iptables_clean: rm -rf $(STATEDIR)/iptables.* - rm -rf $(IMAGEDIR)/iptables_* + rm -rf $(PKGDIR)/iptables_* rm -rf $(IPTABLES_DIR) # vim: syntax=make diff --git a/rules/joe.make b/rules/joe.make index b2505a508..7c192b699 100644 --- a/rules/joe.make +++ b/rules/joe.make @@ -142,7 +142,7 @@ $(STATEDIR)/joe.targetinstall: $(joe_targetinstall_deps_default) joe_clean: rm -rf $(STATEDIR)/joe.* - rm -rf $(IMAGEDIR)/joe_* + rm -rf $(PKGDIR)/joe_* rm -rf $(JOE_DIR) # vim: syntax=make diff --git a/rules/jvisu.make b/rules/jvisu.make index 6695fdd8b..12fc874bd 100644 --- a/rules/jvisu.make +++ b/rules/jvisu.make @@ -128,7 +128,7 @@ endif jvisu_clean: rm -rf $(STATEDIR)/jvisu.* - rm -rf $(IMAGEDIR)/jvisu_* + rm -rf $(PKGDIR)/jvisu_* rm -rf $(JVISU_DIR) # vim: syntax=make diff --git a/rules/kaffe.make b/rules/kaffe.make index c89af56db..459a121d7 100644 --- a/rules/kaffe.make +++ b/rules/kaffe.make @@ -199,7 +199,7 @@ endif kaffe_clean: rm -rf $(STATEDIR)/kaffe.* - rm -rf $(IMAGEDIR)/kaffe_* + rm -rf $(PKGDIR)/kaffe_* rm -rf $(KAFFE_DIR) # vim: syntax=make diff --git a/rules/kernel.make b/rules/kernel.make index 49ee8ae92..694abadd9 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -253,7 +253,7 @@ endif kernel_clean: rm -rf $(STATEDIR)/kernel.* - rm -rf $(IMAGEDIR)/kernel_* + rm -rf $(PKGDIR)/kernel_* rm -rf $(KERNEL_DIR) # ---------------------------------------------------------------------------- diff --git a/rules/klibc.make b/rules/klibc.make index b57a49c39..088652d1f 100644 --- a/rules/klibc.make +++ b/rules/klibc.make @@ -246,7 +246,7 @@ $(STATEDIR)/klibc.targetinstall: $(klibc_targetinstall_deps_default) klibc_clean: rm -rf $(STATEDIR)/klibc.* - rm -rf $(IMAGEDIR)/klibc_* + rm -rf $(PKGDIR)/klibc_* rm -rf $(KLIBC_DIR) rm -rf $(PTXCONF_SYSROOT_CROSS)/bin/klcc diff --git a/rules/ldd.make b/rules/ldd.make index fd8a06910..ed1edc9da 100644 --- a/rules/ldd.make +++ b/rules/ldd.make @@ -85,6 +85,6 @@ $(STATEDIR)/ldd.targetinstall: ldd_clean: rm -rf $(STATEDIR)/ldd.* - rm -rf $(IMAGEDIR)/ldd_* + rm -rf $(PKGDIR)/ldd_* # vim: syntax=make diff --git a/rules/less.make b/rules/less.make index 243dd60f8..7ece19e45 100644 --- a/rules/less.make +++ b/rules/less.make @@ -190,7 +190,7 @@ endif less_clean: rm -rf $(STATEDIR)/less.* - rm -rf $(IMAGEDIR)/less_* + rm -rf $(PKGDIR)/less_* rm -rf $(LESS_DIR) # vim: syntax=make diff --git a/rules/libcgi.make b/rules/libcgi.make index 129ae2649..f982c391c 100644 --- a/rules/libcgi.make +++ b/rules/libcgi.make @@ -127,7 +127,7 @@ $(STATEDIR)/libcgi.targetinstall: $(libcgi_targetinstall_deps_default) libcgi_clean: rm -rf $(STATEDIR)/libcgi.* - rm -rf $(IMAGEDIR)/libcgi_* + rm -rf $(PKGDIR)/libcgi_* rm -rf $(LIBCGI_DIR) # vim: syntax=make diff --git a/rules/libcgicc.make b/rules/libcgicc.make index f6128c9c7..26665f76f 100644 --- a/rules/libcgicc.make +++ b/rules/libcgicc.make @@ -76,7 +76,7 @@ $(STATEDIR)/libcgicc.targetinstall: libcgicc_clean: rm -rf $(STATEDIR)/libcgicc.* - rm -rf $(IMAGEDIR)/libcgicc_* + rm -rf $(PKGDIR)/libcgicc_* rm -rf $(LIBCGICC_DIR) # vim: syntax=make diff --git a/rules/libconfuse.make b/rules/libconfuse.make index a65604fdb..9b256dab1 100644 --- a/rules/libconfuse.make +++ b/rules/libconfuse.make @@ -138,7 +138,7 @@ endif libconfuse_clean: rm -rf $(STATEDIR)/libconfuse.* - rm -rf $(IMAGEDIR)/libconfuse_* + rm -rf $(PKGDIR)/libconfuse_* rm -rf $(LIBCONFUSE_DIR) # vim: syntax=make diff --git a/rules/libcurl.make b/rules/libcurl.make index b30109c64..bd5c5f68f 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -151,7 +151,7 @@ endif libcurl_clean: rm -rf $(STATEDIR)/libcurl.* - rm -rf $(IMAGEDIR)/libcurl_* + rm -rf $(PKGDIR)/libcurl_* rm -rf $(LIBCURL_DIR) # vim: syntax=make diff --git a/rules/libdaemon.make b/rules/libdaemon.make index 3289b8b9f..ce306c815 100644 --- a/rules/libdaemon.make +++ b/rules/libdaemon.make @@ -138,7 +138,7 @@ $(STATEDIR)/libdaemon.targetinstall: $(libdaemon_targetinstall_deps_default) libdaemon_clean: rm -rf $(STATEDIR)/libdaemon.* - rm -rf $(IMAGEDIR)/libdaemon_* + rm -rf $(PKGDIR)/libdaemon_* rm -rf $(LIBDAEMON_DIR) # vim: syntax=make diff --git a/rules/libdbus-cxx.make b/rules/libdbus-cxx.make index c3990c06a..9f6bc0450 100644 --- a/rules/libdbus-cxx.make +++ b/rules/libdbus-cxx.make @@ -92,7 +92,7 @@ $(STATEDIR)/libdbus-cxx.targetinstall: libdbus-cxx_clean: rm -rf $(STATEDIR)/libdbus-cxx.* - rm -rf $(IMAGEDIR)/libdbus-cxx_* + rm -rf $(PKGDIR)/libdbus-cxx_* rm -rf $(LIBDBUS_CXX_DIR) # vim: syntax=make diff --git a/rules/libdrm.make b/rules/libdrm.make index b5bd4d57b..8211c15fd 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -131,7 +131,7 @@ $(STATEDIR)/libdrm.targetinstall: $(libdrm_targetinstall_deps_default) libdrm_clean: rm -rf $(STATEDIR)/libdrm.* - rm -rf $(IMAGEDIR)/libdrm_* + rm -rf $(PKGDIR)/libdrm_* rm -rf $(LIBDRM_DIR) # vim: syntax=make diff --git a/rules/libelf.make b/rules/libelf.make index 2d3f9e937..98530bdc9 100644 --- a/rules/libelf.make +++ b/rules/libelf.make @@ -115,7 +115,7 @@ $(STATEDIR)/libelf.targetinstall: $(libelf_targetinstall_deps_default) libelf_clean: rm -rf $(STATEDIR)/libelf.* - rm -rf $(IMAGEDIR)/libelf_* + rm -rf $(PKGDIR)/libelf_* rm -rf $(LIBELF_DIR) # vim: syntax=make diff --git a/rules/libezv24.make b/rules/libezv24.make index b13d30b8e..5a5d9372b 100644 --- a/rules/libezv24.make +++ b/rules/libezv24.make @@ -134,7 +134,7 @@ $(STATEDIR)/libezv24.targetinstall: $(libezv24_targetinstall_deps_default) libezv24_clean: rm -rf $(STATEDIR)/libezv24.* - rm -rf $(IMAGEDIR)/libezv24_* + rm -rf $(PKGDIR)/libezv24_* rm -rf $(LIBEZV24_DIR) # vim: syntax=make diff --git a/rules/libglade.make b/rules/libglade.make index c96b528b3..0cb256bfa 100644 --- a/rules/libglade.make +++ b/rules/libglade.make @@ -131,7 +131,7 @@ $(STATEDIR)/libglade.targetinstall: libglade_clean: rm -rf $(STATEDIR)/libglade.* - rm -rf $(IMAGEDIR)/libglade_* + rm -rf $(PKGDIR)/libglade_* rm -rf $(LIBGLADE_DIR) # vim: syntax=make diff --git a/rules/libgmp.make b/rules/libgmp.make index 9a29bc503..95ea9463a 100644 --- a/rules/libgmp.make +++ b/rules/libgmp.make @@ -92,7 +92,7 @@ endif libgmp_clean: rm -rf $(STATEDIR)/libgmp.* - rm -rf $(IMAGEDIR)/libgmp_* + rm -rf $(PKGDIR)/libgmp_* rm -rf $(LIBGMP_DIR) # vim: syntax=make diff --git a/rules/libgsloop.make b/rules/libgsloop.make index ead9f3ba0..290dc4342 100644 --- a/rules/libgsloop.make +++ b/rules/libgsloop.make @@ -127,7 +127,7 @@ $(STATEDIR)/libgsloop.targetinstall: libgsloop_clean: rm -rf $(STATEDIR)/libgsloop.* - rm -rf $(IMAGEDIR)/libgsloop_* + rm -rf $(PKGDIR)/libgsloop_* rm -rf $(LIBGSLOOP_DIR) # vim: syntax=make diff --git a/rules/libiconv.make b/rules/libiconv.make index 5178d8fb4..3f522bf2c 100644 --- a/rules/libiconv.make +++ b/rules/libiconv.make @@ -124,7 +124,7 @@ $(STATEDIR)/libiconv.targetinstall: libiconv_clean: rm -rf $(STATEDIR)/libiconv.* - rm -rf $(IMAGEDIR)/libiconv_* + rm -rf $(PKGDIR)/libiconv_* rm -rf $(LIBICONV_DIR) # vim: syntax=make diff --git a/rules/libjpeg.make b/rules/libjpeg.make index 427b06491..d2d954be5 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -128,7 +128,7 @@ $(STATEDIR)/libjpeg.targetinstall: libjpeg_clean: rm -rf $(STATEDIR)/libjpeg.* - rm -rf $(IMAGEDIR)/libjpeg_* + rm -rf $(PKGDIR)/libjpeg_* rm -rf $(LIBJPEG_DIR) # vim: syntax=make diff --git a/rules/liblist.make b/rules/liblist.make index 0a01edc0a..734d89a5b 100644 --- a/rules/liblist.make +++ b/rules/liblist.make @@ -128,7 +128,7 @@ $(STATEDIR)/liblist.targetinstall: liblist_clean: rm -rf $(STATEDIR)/liblist.* - rm -rf $(IMAGEDIR)/liblist_* + rm -rf $(PKGDIR)/liblist_* rm -rf $(LIBLIST_DIR) # vim: syntax=make diff --git a/rules/liblockfile.make b/rules/liblockfile.make index 4a1038ea0..4fc39338b 100644 --- a/rules/liblockfile.make +++ b/rules/liblockfile.make @@ -126,7 +126,7 @@ $(STATEDIR)/liblockfile.targetinstall: $(liblockfile_targetinstall_deps_default) liblockfile_clean: rm -rf $(STATEDIR)/liblockfile.* - rm -rf $(IMAGEDIR)/liblockfile_* + rm -rf $(PKGDIR)/liblockfile_* rm -rf $(LIBLOCKFILE_DIR) # vim: syntax=make diff --git a/rules/liblzo.make b/rules/liblzo.make index 2d67b723f..65d12367a 100644 --- a/rules/liblzo.make +++ b/rules/liblzo.make @@ -104,7 +104,7 @@ $(STATEDIR)/liblzo.targetinstall: liblzo_clean: rm -rf $(STATEDIR)/liblzo.* - rm -rf $(IMAGEDIR)/liblzo_* + rm -rf $(PKGDIR)/liblzo_* rm -rf $(LIBLZO_DIR) # vim: syntax=make diff --git a/rules/libmodbus.make b/rules/libmodbus.make index 457d5f0e3..50825a556 100644 --- a/rules/libmodbus.make +++ b/rules/libmodbus.make @@ -131,7 +131,7 @@ $(STATEDIR)/libmodbus.targetinstall: $(libmodbus_targetinstall_deps_default) libmodbus_clean: rm -rf $(STATEDIR)/libmodbus.* - rm -rf $(IMAGEDIR)/libmodbus_* + rm -rf $(PKGDIR)/libmodbus_* rm -rf $(LIBMODBUS_DIR) # vim: syntax=make diff --git a/rules/libmqueue.make b/rules/libmqueue.make index fc363852d..4c7e65fb8 100644 --- a/rules/libmqueue.make +++ b/rules/libmqueue.make @@ -131,7 +131,7 @@ $(STATEDIR)/libmqueue.targetinstall: $(libmqueue_targetinstall_deps_default) libmqueue_clean: rm -rf $(STATEDIR)/libmqueue.* - rm -rf $(IMAGEDIR)/libmqueue_* + rm -rf $(PKGDIR)/libmqueue_* rm -rf $(LIBMQUEUE_DIR) # vim: syntax=make diff --git a/rules/libnet.make b/rules/libnet.make index ed0dc8f8a..5723cbf4c 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -118,7 +118,7 @@ $(STATEDIR)/libnet.targetinstall: $(libnet_targetinstall_deps_default) libnet_clean: rm -rf $(STATEDIR)/libnet.* - rm -rf $(IMAGEDIR)/libnet_* + rm -rf $(PKGDIR)/libnet_* rm -rf $(LIBNET_DIR) # vim: syntax=make diff --git a/rules/libnetpbm.make b/rules/libnetpbm.make index 6b6f1b2e9..d47b22113 100644 --- a/rules/libnetpbm.make +++ b/rules/libnetpbm.make @@ -155,7 +155,7 @@ endif libnetpbm_clean: rm -rf $(STATEDIR)/libnetpbm.* - rm -rf $(IMAGEDIR)/libnetpbm_* + rm -rf $(PKGDIR)/libnetpbm_* rm -rf $(LIBNETPBM_DIR) # vim: syntax=make diff --git a/rules/liboil.make b/rules/liboil.make index 1b12e8520..48a2fb23c 100644 --- a/rules/liboil.make +++ b/rules/liboil.make @@ -129,7 +129,7 @@ $(STATEDIR)/liboil.targetinstall: $(liboil_targetinstall_deps_default) liboil_clean: rm -rf $(STATEDIR)/liboil.* - rm -rf $(IMAGEDIR)/liboil_* + rm -rf $(PKGDIR)/liboil_* rm -rf $(LIBOIL_DIR) # vim: syntax=make diff --git a/rules/liboop.make b/rules/liboop.make index c6359e404..cfebf898f 100644 --- a/rules/liboop.make +++ b/rules/liboop.make @@ -59,7 +59,7 @@ $(STATEDIR)/liboop.targetinstall: liboop_clean: rm -rf $(STATEDIR)/liboop.* - rm -rf $(IMAGEDIR)/liboop_* + rm -rf $(PKGDIR)/liboop_* rm -rf $(LIBOOP_DIR) # vim: syntax=make diff --git a/rules/libpcre.make b/rules/libpcre.make index 0a933c05f..a07fdbfa9 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -91,7 +91,7 @@ endif libpcre_clean: rm -rf $(STATEDIR)/libpcre.* - rm -rf $(IMAGEDIR)/libpcre_* + rm -rf $(PKGDIR)/libpcre_* rm -rf $(LIBPCRE_DIR) # vim: syntax=make diff --git a/rules/libpng.make b/rules/libpng.make index fab14a0ec..a309b82e0 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -121,7 +121,7 @@ $(STATEDIR)/libpng.targetinstall: libpng_clean: rm -rf $(STATEDIR)/libpng.* - rm -rf $(IMAGEDIR)/libpng_* + rm -rf $(PKGDIR)/libpng_* rm -rf $(LIBPNG_DIR) # vim: syntax=make diff --git a/rules/libpopt.make b/rules/libpopt.make index b0d40d3a5..825f94bdb 100644 --- a/rules/libpopt.make +++ b/rules/libpopt.make @@ -142,7 +142,7 @@ $(STATEDIR)/libpopt.targetinstall: $(libpopt_targetinstall_deps_default) libpopt_clean: rm -rf $(STATEDIR)/libpopt.* - rm -rf $(IMAGEDIR)/libpopt_* + rm -rf $(PKGDIR)/libpopt_* rm -rf $(LIBPOPT_DIR) # vim: syntax=make diff --git a/rules/libpthread-stubs.make b/rules/libpthread-stubs.make index dbe801da9..e1c89fd3b 100644 --- a/rules/libpthread-stubs.make +++ b/rules/libpthread-stubs.make @@ -113,7 +113,7 @@ $(STATEDIR)/libpthread-stubs.targetinstall: $(libpthread-stubs_targetinstall_dep libpthread-stubs_clean: rm -rf $(STATEDIR)/libpthread-stubs.* - rm -rf $(IMAGEDIR)/libpthread-stubs_* + rm -rf $(PKGDIR)/libpthread-stubs_* rm -rf $(LIBPTHREAD_STUBS_DIR) # vim: syntax=make diff --git a/rules/libpv.make b/rules/libpv.make index 15afaf9a7..644189315 100644 --- a/rules/libpv.make +++ b/rules/libpv.make @@ -142,7 +142,7 @@ endif libpv_clean: rm -rf $(STATEDIR)/libpv.* - rm -rf $(IMAGEDIR)/libpv_* + rm -rf $(PKGDIR)/libpv_* rm -rf $(LIBPV_DIR) # vim: syntax=make diff --git a/rules/librn.make b/rules/librn.make index 1abdecee4..d89acda05 100644 --- a/rules/librn.make +++ b/rules/librn.make @@ -130,7 +130,7 @@ $(STATEDIR)/librn.targetinstall: librn_clean: rm -rf $(STATEDIR)/librn.* - rm -rf $(IMAGEDIR)/librn_* + rm -rf $(PKGDIR)/librn_* rm -rf $(LIBRN_DIR) # vim: syntax=make diff --git a/rules/libsigcpp.make b/rules/libsigcpp.make index 6aa9ad828..bdf89f3e1 100644 --- a/rules/libsigcpp.make +++ b/rules/libsigcpp.make @@ -129,7 +129,7 @@ $(STATEDIR)/libsigcpp.targetinstall: $(libsigcpp_targetinstall_deps_default) libsigcpp_clean: rm -rf $(STATEDIR)/libsigcpp.* - rm -rf $(IMAGEDIR)/libsigcpp_* + rm -rf $(PKGDIR)/libsigcpp_* rm -rf $(LIBSIGCPP_DIR) # vim: syntax=make diff --git a/rules/libucdaemon.make b/rules/libucdaemon.make index 52960b587..d3204da0f 100644 --- a/rules/libucdaemon.make +++ b/rules/libucdaemon.make @@ -130,7 +130,7 @@ $(STATEDIR)/libucdaemon.targetinstall: libucdaemon_clean: rm -rf $(STATEDIR)/libucdaemon.* - rm -rf $(IMAGEDIR)/libucdaemon_* + rm -rf $(PKGDIR)/libucdaemon_* rm -rf $(LIBUCDAEMON_DIR) # vim: syntax=make diff --git a/rules/libusb.make b/rules/libusb.make index 87cf3be4f..7e8cb28a9 100644 --- a/rules/libusb.make +++ b/rules/libusb.make @@ -127,7 +127,7 @@ $(STATEDIR)/libusb.targetinstall: $(libusb_targetinstall_deps_default) libusb_clean: rm -rf $(STATEDIR)/libusb.* - rm -rf $(IMAGEDIR)/libusb_* + rm -rf $(PKGDIR)/libusb_* rm -rf $(LIBUSB_DIR) # vim: syntax=make diff --git a/rules/libxcb.make b/rules/libxcb.make index 0988a84df..92cfba81a 100644 --- a/rules/libxcb.make +++ b/rules/libxcb.make @@ -241,7 +241,7 @@ $(STATEDIR)/libxcb.targetinstall: $(libxcb_targetinstall_deps_default) libxcb_clean: rm -rf $(STATEDIR)/libxcb.* - rm -rf $(IMAGEDIR)/libxcb_* + rm -rf $(PKGDIR)/libxcb_* rm -rf $(LIBXCB_DIR) # vim: syntax=make diff --git a/rules/libxml2.make b/rules/libxml2.make index 6240189b8..7ba3cbe6a 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -337,7 +337,7 @@ $(STATEDIR)/libxml2.targetinstall: $(libxml2_targetinstall_deps_default) libxml2_clean: rm -rf $(STATEDIR)/libxml2.* - rm -rf $(IMAGEDIR)/libxml2_* + rm -rf $(PKGDIR)/libxml2_* rm -rf $(LIBXML2_DIR) # vim: syntax=make diff --git a/rules/libxmlconfig.make b/rules/libxmlconfig.make index 35775fb05..e4c714826 100644 --- a/rules/libxmlconfig.make +++ b/rules/libxmlconfig.make @@ -129,7 +129,7 @@ $(STATEDIR)/libxmlconfig.targetinstall: libxmlconfig_clean: rm -rf $(STATEDIR)/libxmlconfig.* - rm -rf $(IMAGEDIR)/libxmlconfig_* + rm -rf $(PKGDIR)/libxmlconfig_* rm -rf $(LIBXMLCONFIG_DIR) # vim: syntax=make diff --git a/rules/libxslt.make b/rules/libxslt.make index 4152fb989..d9f5afefd 100644 --- a/rules/libxslt.make +++ b/rules/libxslt.make @@ -177,7 +177,7 @@ endif libxslt_clean: rm -rf $(STATEDIR)/libxslt.* - rm -rf $(IMAGEDIR)/libxslt_* + rm -rf $(PKGDIR)/libxslt_* rm -rf $(LIBXSLT_DIR) # vim: syntax=make diff --git a/rules/lighttpd.make b/rules/lighttpd.make index 04bc1e531..040560e9d 100644 --- a/rules/lighttpd.make +++ b/rules/lighttpd.make @@ -248,7 +248,7 @@ $(STATEDIR)/lighttpd.targetinstall: $(lighttpd_targetinstall_deps_default) lighttpd_clean: rm -rf $(STATEDIR)/lighttpd.* - rm -rf $(IMAGEDIR)/lighttpd_* + rm -rf $(PKGDIR)/lighttpd_* rm -rf $(LIGHTTPD_DIR) # vim: syntax=make diff --git a/rules/lilo.make b/rules/lilo.make index 6206b34ed..0be16ec01 100644 --- a/rules/lilo.make +++ b/rules/lilo.make @@ -105,7 +105,7 @@ $(STATEDIR)/lilo.targetinstall: $(lilo_targetinstall_deps_default) lilo_clean: rm -rf $(STATEDIR)/lilo.* - rm -rf $(IMAGEDIR)/lilo_* + rm -rf $(PKGDIR)/lilo_* rm -rf $(LILO_DIR) # vim: syntax=make diff --git a/rules/lite.make b/rules/lite.make index 2f01e78be..d7b3c566c 100644 --- a/rules/lite.make +++ b/rules/lite.make @@ -185,7 +185,7 @@ $(STATEDIR)/lite.targetinstall: $(lite_targetinstall_deps_default) lite_clean: rm -rf $(STATEDIR)/lite.* - rm -rf $(IMAGEDIR)/lite_* + rm -rf $(PKGDIR)/lite_* rm -rf $(LITE_DIR) # vim: syntax=make diff --git a/rules/live.make b/rules/live.make index 85b42320f..9956f4324 100644 --- a/rules/live.make +++ b/rules/live.make @@ -166,7 +166,7 @@ $(STATEDIR)/live.targetinstall: $(live_targetinstall_deps_default) live_clean: rm -rf $(STATEDIR)/live.* - rm -rf $(IMAGEDIR)/live_* + rm -rf $(PKGDIR)/live_* rm -rf $(LIVE_DIR) # vim: syntax=make diff --git a/rules/locales.make b/rules/locales.make index 3c87e1a45..1ac215efc 100644 --- a/rules/locales.make +++ b/rules/locales.make @@ -121,7 +121,7 @@ $(STATEDIR)/locales.targetinstall: locales_clean: rm -rf $(STATEDIR)/locales.* - rm -rf $(IMAGEDIR)/locales_* + rm -rf $(PKGDIR)/locales_* rm -rf $(LOCALES_DIR) # vim: syntax=make diff --git a/rules/logrotate.make b/rules/logrotate.make index a70903062..fb924ed66 100644 --- a/rules/logrotate.make +++ b/rules/logrotate.make @@ -117,7 +117,7 @@ $(STATEDIR)/logrotate.targetinstall: $(logrotate_targetinstall_deps_default) logrotate_clean: rm -rf $(STATEDIR)/logrotate.* - rm -rf $(IMAGEDIR)/logrotate_* + rm -rf $(PKGDIR)/logrotate_* rm -rf $(LOGROTATE_DIR) # vim: syntax=make diff --git a/rules/lrzsz.make b/rules/lrzsz.make index 83a55fd78..1e487f34d 100644 --- a/rules/lrzsz.make +++ b/rules/lrzsz.make @@ -128,7 +128,7 @@ $(STATEDIR)/lrzsz.targetinstall: $(lrzsz_targetinstall_deps_default) lrzsz_clean: rm -rf $(STATEDIR)/lrzsz.* - rm -rf $(IMAGEDIR)/lrzsz_* + rm -rf $(PKGDIR)/lrzsz_* rm -rf $(LRZSZ_DIR) # vim: syntax=make diff --git a/rules/lsh.make b/rules/lsh.make index 2a090673a..87bb6ec29 100644 --- a/rules/lsh.make +++ b/rules/lsh.make @@ -103,7 +103,7 @@ endif lsh_clean: rm -rf $(STATEDIR)/lsh.* - rm -rf $(IMAGEDIR)/lsh_* + rm -rf $(PKGDIR)/lsh_* rm -rf $(LSH_DIR) # vim: syntax=make diff --git a/rules/ltp-ballista.make b/rules/ltp-ballista.make index fdd3f5c55..afd33e8c2 100644 --- a/rules/ltp-ballista.make +++ b/rules/ltp-ballista.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-ballista.targetinstall: ltp-ballista_clean: rm -rf $(STATEDIR)/ltp-ballista.* - rm -rf $(IMAGEDIR)/ltp-ballista_* + rm -rf $(PKGDIR)/ltp-ballista_* rm -rf $(LTP_BALLISTA_DIR) # vim: syntax=make diff --git a/rules/ltp-base.make b/rules/ltp-base.make index 7338051df..b2ebce9dd 100644 --- a/rules/ltp-base.make +++ b/rules/ltp-base.make @@ -125,7 +125,7 @@ $(STATEDIR)/ltp_base.targetinstall: $(ltp_base_targetinstall_deps_default) ltp_base_clean: rm -rf $(STATEDIR)/ltp_base.* - rm -rf $(IMAGEDIR)/ltp_base_* + rm -rf $(PKGDIR)/ltp_base_* rm -rf $(LTP_BASE_DIR) # vim: syntax=make diff --git a/rules/ltp-commands.make b/rules/ltp-commands.make index e4e10b980..5cdc50e96 100644 --- a/rules/ltp-commands.make +++ b/rules/ltp-commands.make @@ -113,7 +113,7 @@ $(STATEDIR)/ltp-commands.targetinstall: ltp-commands_clean: rm -rf $(STATEDIR)/ltp-commands.* - rm -rf $(IMAGEDIR)/ltp-commands_* + rm -rf $(PKGDIR)/ltp-commands_* rm -rf $(LTP_COMMANDS_DIR) # vim: syntax=make diff --git a/rules/ltp-dots.make b/rules/ltp-dots.make index 435ea9030..43b2c88e0 100644 --- a/rules/ltp-dots.make +++ b/rules/ltp-dots.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-dots.targetinstall: ltp-dots_clean: rm -rf $(STATEDIR)/ltp-dots.* - rm -rf $(IMAGEDIR)/ltp-dots_* + rm -rf $(PKGDIR)/ltp-dots_* rm -rf $(LTP_DOTS_DIR) # vim: syntax=make diff --git a/rules/ltp-hpi.make b/rules/ltp-hpi.make index 42240dda8..43427ca0c 100644 --- a/rules/ltp-hpi.make +++ b/rules/ltp-hpi.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-hpi.targetinstall: ltp-hpi_clean: rm -rf $(STATEDIR)/ltp-hpi.* - rm -rf $(IMAGEDIR)/ltp-hpi_* + rm -rf $(PKGDIR)/ltp-hpi_* rm -rf $(LTP_HPI_DIR) # vim: syntax=make diff --git a/rules/ltp-kdump.make b/rules/ltp-kdump.make index 5b46a079c..8d76cb1ab 100644 --- a/rules/ltp-kdump.make +++ b/rules/ltp-kdump.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-kdump.targetinstall: ltp-kdump_clean: rm -rf $(STATEDIR)/ltp-kdump.* - rm -rf $(IMAGEDIR)/ltp-kdump_* + rm -rf $(PKGDIR)/ltp-kdump_* rm -rf $(LTP_KDUMP_DIR) # vim: syntax=make diff --git a/rules/ltp-kernel.make b/rules/ltp-kernel.make index c26b78678..ddf1f39e7 100644 --- a/rules/ltp-kernel.make +++ b/rules/ltp-kernel.make @@ -159,7 +159,7 @@ $(STATEDIR)/ltp-kernel.targetinstall: ltp-kernel_clean: rm -rf $(STATEDIR)/ltp-kernel.* - rm -rf $(IMAGEDIR)/ltp-kernel_* + rm -rf $(PKGDIR)/ltp-kernel_* rm -rf $(LTP_KERNEL_DIR) # vim: syntax=make diff --git a/rules/ltp-misc.make b/rules/ltp-misc.make index 23e4d7199..8769226ae 100644 --- a/rules/ltp-misc.make +++ b/rules/ltp-misc.make @@ -113,7 +113,7 @@ $(STATEDIR)/ltp-misc.targetinstall: ltp-misc_clean: rm -rf $(STATEDIR)/ltp-misc.* - rm -rf $(IMAGEDIR)/ltp-misc_* + rm -rf $(PKGDIR)/ltp-misc_* rm -rf $(LTP_MISC_DIR) # vim: syntax=make diff --git a/rules/ltp-network.make b/rules/ltp-network.make index 3a98b277b..6ddb3230f 100644 --- a/rules/ltp-network.make +++ b/rules/ltp-network.make @@ -113,7 +113,7 @@ $(STATEDIR)/ltp-network.targetinstall: ltp-network_clean: rm -rf $(STATEDIR)/ltp-network.* - rm -rf $(IMAGEDIR)/ltp-network_* + rm -rf $(PKGDIR)/ltp-network_* rm -rf $(LTP_NETWORK_DIR) # vim: syntax=make diff --git a/rules/ltp-posix.make b/rules/ltp-posix.make index 61db30b7c..78dd40d59 100644 --- a/rules/ltp-posix.make +++ b/rules/ltp-posix.make @@ -143,7 +143,7 @@ endif ltp-posix_clean: rm -rf $(STATEDIR)/ltp-posix.* - rm -rf $(IMAGEDIR)/ltp-posix_* + rm -rf $(PKGDIR)/ltp-posix_* rm -rf $(LTP_POSIX_DIR) # vim: syntax=make diff --git a/rules/ltp-pounder21.make b/rules/ltp-pounder21.make index d9dd73eed..d8b6dfc88 100644 --- a/rules/ltp-pounder21.make +++ b/rules/ltp-pounder21.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-pounder21.targetinstall: ltp-pounder21_clean: rm -rf $(STATEDIR)/ltp-pounder21.* - rm -rf $(IMAGEDIR)/ltp-pounder21_* + rm -rf $(PKGDIR)/ltp-pounder21_* rm -rf $(LTP_POUNDER21_DIR) # vim: syntax=make diff --git a/rules/ltp-realtime.make b/rules/ltp-realtime.make index 18f7de69c..f85ca8fc3 100644 --- a/rules/ltp-realtime.make +++ b/rules/ltp-realtime.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-realtime.targetinstall: ltp-realtime_clean: rm -rf $(STATEDIR)/ltp-realtime.* - rm -rf $(IMAGEDIR)/ltp-realtime_* + rm -rf $(PKGDIR)/ltp-realtime_* rm -rf $(LTP_REALTIME_DIR) # vim: syntax=make diff --git a/rules/ltp-template.make b/rules/ltp-template.make index 8873b10c2..a5285810d 100644 --- a/rules/ltp-template.make +++ b/rules/ltp-template.make @@ -110,7 +110,7 @@ $(STATEDIR)/ltp-template.targetinstall: ltp-template_clean: rm -rf $(STATEDIR)/ltp-template.* - rm -rf $(IMAGEDIR)/ltp-template_* + rm -rf $(PKGDIR)/ltp-template_* rm -rf $(LTP_TEMPLATE_DIR) # vim: syntax=make diff --git a/rules/ltt-control.make b/rules/ltt-control.make index f6997a853..cb6450ae7 100644 --- a/rules/ltt-control.make +++ b/rules/ltt-control.make @@ -136,7 +136,7 @@ $(STATEDIR)/ltt-control.targetinstall: $(ltt-control_targetinstall_deps_default) ltt-control_clean: rm -rf $(STATEDIR)/ltt-control.* - rm -rf $(IMAGEDIR)/ltt-control_* + rm -rf $(PKGDIR)/ltt-control_* rm -rf $(LTT_CONTROL_DIR) # vim: syntax=make diff --git a/rules/mad.make b/rules/mad.make index 97bc46c01..4ce04a01e 100644 --- a/rules/mad.make +++ b/rules/mad.make @@ -154,7 +154,7 @@ $(STATEDIR)/mad.targetinstall: $(mad_targetinstall_deps_default) mad_clean: rm -rf $(STATEDIR)/mad.* - rm -rf $(IMAGEDIR)/mad_* + rm -rf $(PKGDIR)/mad_* rm -rf $(MAD_DIR) # vim: syntax=make diff --git a/rules/madwifi.make b/rules/madwifi.make index b70812ee6..885078f7e 100644 --- a/rules/madwifi.make +++ b/rules/madwifi.make @@ -153,7 +153,7 @@ endif madwifi_clean: rm -rf $(STATEDIR)/madwifi.* - rm -rf $(IMAGEDIR)/madwifi_* + rm -rf $(PKGDIR)/madwifi_* rm -rf $(MADWIFI_DIR) # vim: syntax=make diff --git a/rules/mc.make b/rules/mc.make index 40db67ec1..c106e2dab 100644 --- a/rules/mc.make +++ b/rules/mc.make @@ -136,7 +136,7 @@ $(STATEDIR)/mc.targetinstall: $(mc_targetinstall_deps_default) mc_clean: rm -rf $(STATEDIR)/mc.* - rm -rf $(IMAGEDIR)/mc_* + rm -rf $(PKGDIR)/mc_* rm -rf $(MC_DIR) # vim: syntax=make diff --git a/rules/memedit.make b/rules/memedit.make index bd4d49de3..6d611b455 100644 --- a/rules/memedit.make +++ b/rules/memedit.make @@ -126,7 +126,7 @@ $(STATEDIR)/memedit.targetinstall: $(memedit_targetinstall_deps_default) memedit_clean: rm -rf $(STATEDIR)/memedit.* - rm -rf $(IMAGEDIR)/memedit_* + rm -rf $(PKGDIR)/memedit_* rm -rf $(MEMEDIT_DIR) # vim: syntax=make diff --git a/rules/memstat.make b/rules/memstat.make index 75fdf0823..4e0ca547a 100644 --- a/rules/memstat.make +++ b/rules/memstat.make @@ -125,7 +125,7 @@ $(STATEDIR)/memstat.targetinstall: $(memstat_targetinstall_deps_default) memstat_clean: rm -rf $(STATEDIR)/memstat.* - rm -rf $(IMAGEDIR)/memstat_* + rm -rf $(PKGDIR)/memstat_* rm -rf $(MEMSTAT_DIR) # vim: syntax=make diff --git a/rules/memtest.make b/rules/memtest.make index c08ce3f41..6df821301 100644 --- a/rules/memtest.make +++ b/rules/memtest.make @@ -122,7 +122,7 @@ $(STATEDIR)/memtest.targetinstall: $(memtest_targetinstall_deps_default) memtest_clean: rm -rf $(STATEDIR)/memtest.* - rm -rf $(IMAGEDIR)/memtest_* + rm -rf $(PKGDIR)/memtest_* rm -rf $(MEMTEST_DIR) # vim: syntax=make diff --git a/rules/memtester.make b/rules/memtester.make index 68bc9d8d4..bb9ef7e8b 100644 --- a/rules/memtester.make +++ b/rules/memtester.make @@ -118,7 +118,7 @@ $(STATEDIR)/memtester.targetinstall: $(memtester_targetinstall_deps_default) memtester_clean: rm -rf $(STATEDIR)/memtester.* - rm -rf $(IMAGEDIR)/memtester_* + rm -rf $(PKGDIR)/memtester_* rm -rf $(MEMTESTER_DIR) # vim: syntax=make diff --git a/rules/mesalib.make b/rules/mesalib.make index 1d2ce7228..a87059a32 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -114,7 +114,7 @@ $(STATEDIR)/mesalib.targetinstall: $(mesalib_targetinstall_deps_default) mesalib_clean: rm -rf $(STATEDIR)/mesalib.* - rm -rf $(IMAGEDIR)/mesalib_* + rm -rf $(PKGDIR)/mesalib_* rm -rf $(MESALIB_DIR) # vim: syntax=make diff --git a/rules/mfirebird.make b/rules/mfirebird.make index e57c051fa..e7fbe96c7 100644 --- a/rules/mfirebird.make +++ b/rules/mfirebird.make @@ -472,7 +472,7 @@ $(STATEDIR)/mfirebird.targetinstall: $(mfirebird_targetinstall_deps_default) mfirebird_clean: rm -rf $(STATEDIR)/mfirebird.* - rm -rf $(IMAGEDIR)/mfirebird_* + rm -rf $(PKGDIR)/mfirebird_* rm -rf $(MFIREBIRD_DIR) # vim: syntax=make diff --git a/rules/mgetty.make b/rules/mgetty.make index 5266efae7..c77e74546 100644 --- a/rules/mgetty.make +++ b/rules/mgetty.make @@ -159,7 +159,7 @@ endif mgetty_clean: rm -rf $(STATEDIR)/mgetty.* - rm -rf $(IMAGEDIR)/mgetty_* + rm -rf $(PKGDIR)/mgetty_* rm -rf $(MGETTY_DIR) # vim: syntax=make diff --git a/rules/mico.make b/rules/mico.make index d5a5fc136..91b15d5dd 100644 --- a/rules/mico.make +++ b/rules/mico.make @@ -261,7 +261,7 @@ endif mico_clean: rm -rf $(STATEDIR)/mico.* - rm -rf $(IMAGEDIR)/mico_* + rm -rf $(PKGDIR)/mico_* rm -rf $(MICO_DIR) # vim: syntax=make diff --git a/rules/mii-diag.make b/rules/mii-diag.make index 251b5a0d6..b7e6d8ce4 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -116,7 +116,7 @@ $(STATEDIR)/mii-diag.targetinstall: $(mii-diag_targetinstall_deps_default) mii-diag_clean: rm -rf $(STATEDIR)/mii-diag.* - rm -rf $(IMAGEDIR)/mii-diag_* + rm -rf $(PKGDIR)/mii-diag_* rm -rf $(MII_DIAG_DIR) # vim: syntax=make diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index d53a553d6..b2c174b26 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -144,7 +144,7 @@ endif module-init-tools_clean: rm -rf $(STATEDIR)/module-init-tools.* - rm -rf $(IMAGEDIR)/module-init-tools_* + rm -rf $(PKGDIR)/module-init-tools_* rm -rf $(MODULE_INIT_TOOLS_DIR) # vim: syntax=make diff --git a/rules/mplayer.make b/rules/mplayer.make index 8450097f3..92a337684 100644 --- a/rules/mplayer.make +++ b/rules/mplayer.make @@ -420,7 +420,7 @@ $(STATEDIR)/mplayer.targetinstall: $(mplayer_targetinstall_deps_default) mplayer_clean: rm -rf $(STATEDIR)/mplayer.* - rm -rf $(IMAGEDIR)/mplayer_* + rm -rf $(PKGDIR)/mplayer_* rm -rf $(MPLAYER_DIR) # vim: syntax=make diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 038a42ec2..818044f8e 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -169,7 +169,7 @@ endif mtd-utils_clean: rm -rf $(STATEDIR)/mtd-utils.* - rm -rf $(IMAGEDIR)/mtd-utils_* + rm -rf $(PKGDIR)/mtd-utils_* rm -rf $(MTD_UTILS_DIR) # vim: syntax=make diff --git a/rules/myghty.make b/rules/myghty.make index 980c398b9..269314893 100644 --- a/rules/myghty.make +++ b/rules/myghty.make @@ -124,7 +124,7 @@ $(STATEDIR)/myghty.targetinstall: $(myghty_targetinstall_deps_default) myghty_clean: rm -rf $(STATEDIR)/myghty.* - rm -rf $(IMAGEDIR)/myghty_* + rm -rf $(PKGDIR)/myghty_* rm -rf $(MYGHTY_DIR) # vim: syntax=make diff --git a/rules/mysql.make b/rules/mysql.make index b2be20022..90b5cd2f0 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -381,7 +381,7 @@ $(STATEDIR)/mysql.targetinstall: $(mysql_targetinstall_deps_default) mysql_clean: rm -rf $(STATEDIR)/mysql.* - rm -rf $(IMAGEDIR)/mysql_* + rm -rf $(PKGDIR)/mysql_* rm -rf $(MYSQL_DIR) # vim: syntax=make diff --git a/rules/nanocom.make b/rules/nanocom.make index 455a05047..979ab1b77 100644 --- a/rules/nanocom.make +++ b/rules/nanocom.make @@ -119,7 +119,7 @@ $(STATEDIR)/nanocom.targetinstall: $(nanocom_targetinstall_deps_default) nanocom_clean: rm -rf $(STATEDIR)/nanocom.* - rm -rf $(IMAGEDIR)/nanocom_* + rm -rf $(PKGDIR)/nanocom_* rm -rf $(NANOCOM_DIR) # vim: syntax=make diff --git a/rules/ncurses.make b/rules/ncurses.make index 95760f0d8..514979446 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -236,6 +236,6 @@ endif ncurses_clean: rm -rf $(STATEDIR)/ncurses.* $(NCURSES_DIR) - rm -rf $(IMAGEDIR)/ncurses_* + rm -rf $(PKGDIR)/ncurses_* # vim: syntax=make diff --git a/rules/netcat.make b/rules/netcat.make index 7e9e537c6..9f139f3f8 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -140,7 +140,7 @@ $(STATEDIR)/netcat.targetinstall: $(netcat_targetinstall_deps_default) netcat_clean: rm -rf $(STATEDIR)/netcat.* - rm -rf $(IMAGEDIR)/netcat_* + rm -rf $(PKGDIR)/netcat_* rm -rf $(NETCAT_DIR) # vim: syntax=make diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make index 33c5d3bbe..fa68395db 100644 --- a/rules/netkit-ftp.make +++ b/rules/netkit-ftp.make @@ -139,7 +139,7 @@ $(STATEDIR)/netkit-ftp.targetinstall: $(netkit-ftp_targetinstall_deps_default) netkit-ftp_clean: rm -rf $(STATEDIR)/netkit-ftp.* - rm -rf $(IMAGEDIR)/netkit-ftp_* + rm -rf $(PKGDIR)/netkit-ftp_* rm -rf $(NETKIT_FTP_DIR) # vim: syntax=make diff --git a/rules/nfsutils.make b/rules/nfsutils.make index d63478237..856277d24 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -300,7 +300,7 @@ endif nfsutils_clean: rm -rf $(STATEDIR)/nfsutils.* - rm -rf $(IMAGEDIR)/nfsutils_* + rm -rf $(PKGDIR)/nfsutils_* rm -rf $(NFSUTILS_DIR) # vim: syntax=make diff --git a/rules/nmap.make b/rules/nmap.make index 6f62fb5f5..c1de3bed6 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -109,7 +109,7 @@ endif nmap_clean: rm -rf $(STATEDIR)/nmap.* - rm -rf $(IMAGEDIR)/nmap_* + rm -rf $(PKGDIR)/nmap_* rm -rf $(NMAP_DIR) # vim: syntax=make diff --git a/rules/ntp.make b/rules/ntp.make index fddb90fee..d910815e2 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -406,7 +406,7 @@ endif ntp_clean: rm -rf $(STATEDIR)/ntp.* - rm -rf $(IMAGEDIR)/ntp_* + rm -rf $(PKGDIR)/ntp_* rm -rf $(NTP_DIR) # vim: syntax=make diff --git a/rules/ntpclient.make b/rules/ntpclient.make index fb97701ea..8c6d06593 100644 --- a/rules/ntpclient.make +++ b/rules/ntpclient.make @@ -149,7 +149,7 @@ endif ntpclient_clean: rm -rf $(STATEDIR)/ntpclient.* - rm -rf $(IMAGEDIR)/ntpclient_* + rm -rf $(PKGDIR)/ntpclient_* rm -rf $(NTPCLIENT_DIR) # vim: syntax=make diff --git a/rules/openafs.make b/rules/openafs.make index 49396b012..1f2fa2992 100644 --- a/rules/openafs.make +++ b/rules/openafs.make @@ -131,7 +131,7 @@ $(STATEDIR)/openafs.targetinstall: $(openafs_targetinstall_deps_default) openafs_clean: rm -rf $(STATEDIR)/openafs.* - rm -rf $(IMAGEDIR)/openafs_* + rm -rf $(PKGDIR)/openafs_* rm -rf $(OPENAFS_DIR) # vim: syntax=make diff --git a/rules/openntpd.make b/rules/openntpd.make index 1547bf2e3..f809b4aa1 100644 --- a/rules/openntpd.make +++ b/rules/openntpd.make @@ -154,7 +154,7 @@ endif openntpd_clean: rm -rf $(STATEDIR)/openntpd.* - rm -rf $(IMAGEDIR)/openntpd_* + rm -rf $(PKGDIR)/openntpd_* rm -rf $(OPENNTPD_DIR) # vim: syntax=make diff --git a/rules/openssh.make b/rules/openssh.make index 8ede7693b..5c818d718 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -193,7 +193,7 @@ endif openssh_clean: rm -rf $(STATEDIR)/openssh.* - rm -rf $(IMAGEDIR)/openssh_* + rm -rf $(PKGDIR)/openssh_* rm -rf $(OPENSSH_DIR) # vim: syntax=make diff --git a/rules/openssl.make b/rules/openssl.make index d331eb13e..0a897b8de 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -168,7 +168,7 @@ endif openssl_clean: rm -rf $(STATEDIR)/openssl.* - rm -rf $(IMAGEDIR)/openssl_* + rm -rf $(PKGDIR)/openssl_* rm -rf $(OPENSSL_DIR) # vim: syntax=make diff --git a/rules/oprofile.make b/rules/oprofile.make index 3cb58dc23..c5d09ab7b 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -114,7 +114,7 @@ $(STATEDIR)/oprofile.targetinstall: oprofile_clean: rm -rf $(STATEDIR)/oprofile.* - rm -rf $(IMAGEDIR)/oprofile_* + rm -rf $(PKGDIR)/oprofile_* rm -rf $(OPROFILE_DIR) # vim: syntax=make diff --git a/rules/pango.make b/rules/pango.make index 99f6b9a43..54934373c 100644 --- a/rules/pango.make +++ b/rules/pango.make @@ -190,7 +190,7 @@ $(STATEDIR)/pango.targetinstall: pango_clean: rm -rf $(STATEDIR)/pango.* - rm -rf $(IMAGEDIR)/pango_* + rm -rf $(PKGDIR)/pango_* rm -rf $(PANGO_DIR) # vim: syntax=make diff --git a/rules/pciutils.make b/rules/pciutils.make index fd94a08be..8f8d9675a 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -127,7 +127,7 @@ $(STATEDIR)/pciutils.targetinstall: $(pciutils_targetinstall_deps_default) pciutils_clean: rm -rf $(STATEDIR)/pciutils.* - rm -rf $(IMAGEDIR)/pciutils_* + rm -rf $(PKGDIR)/pciutils_* rm -rf $(PCIUTILS_DIR) # vim: syntax=make diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make index 235b64b6f..42d453b65 100644 --- a/rules/pcmcia-cs.make +++ b/rules/pcmcia-cs.make @@ -164,7 +164,7 @@ endif pcmcia-cs_clean: rm -rf $(STATEDIR)/pcmcia-cs.* - rm -rf $(IMAGEDIR)/pcmcia-cs_* + rm -rf $(PKGDIR)/pcmcia-cs_* rm -rf $(PCMCIA-CS_DIR) # vim: syntax=make diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index 88c703602..d8b5b8e94 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -162,7 +162,7 @@ endif pcmciautils_clean: rm -rf $(STATEDIR)/pcmciautils.* - rm -rf $(IMAGEDIR)/pcmciautils_* + rm -rf $(PKGDIR)/pcmciautils_* rm -rf $(PCMCIAUTILS_DIR) # vim: syntax=make diff --git a/rules/pdksh.make b/rules/pdksh.make index d8f67cb58..c4b1d7392 100644 --- a/rules/pdksh.make +++ b/rules/pdksh.make @@ -178,7 +178,7 @@ $(STATEDIR)/pdksh.targetinstall: $(pdksh_targetinstall_deps_default) pdksh_clean: rm -rf $(STATEDIR)/pdksh.* - rm -rf $(IMAGEDIR)/pdksh_* + rm -rf $(PKGDIR)/pdksh_* rm -rf $(PDKSH_DIR) # vim: syntax=make diff --git a/rules/pekwm.make b/rules/pekwm.make index 8f19219d3..b0327f087 100644 --- a/rules/pekwm.make +++ b/rules/pekwm.make @@ -129,7 +129,7 @@ $(STATEDIR)/pekwm.targetinstall: $(pekwm_targetinstall_deps_default) pekwm_clean: rm -rf $(STATEDIR)/pekwm.* - rm -rf $(IMAGEDIR)/pekwm_* + rm -rf $(PKGDIR)/pekwm_* rm -rf $(PEKWM_DIR) # vim: syntax=make diff --git a/rules/pelts_tests.make b/rules/pelts_tests.make index 3d626ff34..aaa11b3bd 100644 --- a/rules/pelts_tests.make +++ b/rules/pelts_tests.make @@ -124,7 +124,7 @@ $(STATEDIR)/pelts-tests.targetinstall: $(pelts-tests_targetinstall_deps_default) pelts-tests_clean: rm -rf $(STATEDIR)/pelts-tests.* - rm -rf $(IMAGEDIR)/pelts-tests_* + rm -rf $(PKGDIR)/pelts-tests_* rm -rf $(PELTS_TESTS_DIR) # vim: syntax=make diff --git a/rules/penguzilla.make b/rules/penguzilla.make index 0e13fd202..666dc33b4 100644 --- a/rules/penguzilla.make +++ b/rules/penguzilla.make @@ -135,7 +135,7 @@ $(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps_default) penguzilla_clean: rm -rf $(STATEDIR)/penguzilla.* - rm -rf $(IMAGEDIR)/penguzilla_* + rm -rf $(PKGDIR)/penguzilla_* rm -rf $(PENGUZILLA_DIR) # vim: syntax=make diff --git a/rules/php-apc.make b/rules/php-apc.make index 6fb272aab..3cd4a6f3f 100644 --- a/rules/php-apc.make +++ b/rules/php-apc.make @@ -131,7 +131,7 @@ $(STATEDIR)/php-apc.targetinstall: $(php-apc_targetinstall_deps_default) php-apc_clean: rm -rf $(STATEDIR)/php-apc.* - rm -rf $(IMAGEDIR)/php-apc_* + rm -rf $(PKGDIR)/php-apc_* rm -rf $(PHP_APC_DIR) # vim: syntax=make diff --git a/rules/php5.make b/rules/php5.make index 88b5c9434..bc2bd80ea 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -361,7 +361,7 @@ endif php5_clean: rm -rf $(STATEDIR)/php5.* - rm -rf $(IMAGEDIR)/php5_* + rm -rf $(PKGDIR)/php5_* rm -rf $(PHP5_DIR) # vim: syntax=make diff --git a/rules/pixman.make b/rules/pixman.make index d8e8618a6..32b4ea546 100644 --- a/rules/pixman.make +++ b/rules/pixman.make @@ -127,7 +127,7 @@ $(STATEDIR)/pixman.targetinstall: $(pixman_targetinstall_deps_default) pixman_clean: rm -rf $(STATEDIR)/pixman.* - rm -rf $(IMAGEDIR)/pixman_* + rm -rf $(PKGDIR)/pixman_* rm -rf $(PIXMAN_DIR) # vim: syntax=make diff --git a/rules/pnputils.make b/rules/pnputils.make index 749f40bfa..caa79f032 100644 --- a/rules/pnputils.make +++ b/rules/pnputils.make @@ -120,7 +120,7 @@ endif pnputils_clean: rm -rf $(STATEDIR)/pnputils.* - rm -rf $(IMAGEDIR)/pnputils_* + rm -rf $(PKGDIR)/pnputils_* rm -rf $(PNPUTILS_DIR) # vim: syntax=make diff --git a/rules/pop3spam.make b/rules/pop3spam.make index 8445032db..75356d321 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -86,7 +86,7 @@ $(STATEDIR)/pop3spam.targetinstall: pop3spam_clean: rm -rf $(STATEDIR)/pop3spam.* - rm -rf $(IMAGEDIR)/pop3spam_* + rm -rf $(PKGDIR)/pop3spam_* rm -rf $(POP3SPAM_DIR) # vim: syntax=make diff --git a/rules/poppler.make b/rules/poppler.make index 4ad4122e5..f6c9eb810 100644 --- a/rules/poppler.make +++ b/rules/poppler.make @@ -179,7 +179,7 @@ endif poppler_clean: rm -rf $(STATEDIR)/poppler.* - rm -rf $(IMAGEDIR)/poppler_* + rm -rf $(PKGDIR)/poppler_* rm -rf $(POPPLER_DIR) # vim: syntax=make diff --git a/rules/portmap.make b/rules/portmap.make index 0d30f5f8f..07b1b70f3 100644 --- a/rules/portmap.make +++ b/rules/portmap.make @@ -152,7 +152,7 @@ endif portmap_clean: rm -rf $(STATEDIR)/portmap.* - rm -rf $(IMAGEDIR)/portmap_* + rm -rf $(PKGDIR)/portmap_* rm -rf $(PORTMAP_DIR) # vim: syntax=make diff --git a/rules/ppp.make b/rules/ppp.make index e19a3ea97..cf5e1654e 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -155,7 +155,7 @@ $(STATEDIR)/ppp.targetinstall: $(ppp_targetinstall_deps_default) ppp_clean: rm -rf $(STATEDIR)/ppp.* - rm -rf $(IMAGEDIR)/ppp_* + rm -rf $(PKGDIR)/ppp_* rm -rf $(PPP_DIR) # vim: syntax=make diff --git a/rules/procps.make b/rules/procps.make index 39afb66e8..d64c293dc 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -144,7 +144,7 @@ endif procps_clean: rm -rf $(STATEDIR)/procps.* - rm -rf $(IMAGEDIR)/procps_* + rm -rf $(PKGDIR)/procps_* rm -rf $(PROCPS_DIR) # vim: syntax=make diff --git a/rules/proftpd.make b/rules/proftpd.make index c30ef0a33..fc091e7dc 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -162,6 +162,6 @@ endif proftpd_clean: rm -rf $(STATEDIR)/proftpd.* $(PROFTPD_DIR) - rm -rf $(IMAGEDIR)/proftpd_* + rm -rf $(PKGDIR)/proftpd_* # vim: syntax=make diff --git a/rules/ptxdist.make b/rules/ptxdist.make index 58a4f14a7..787a88e58 100644 --- a/rules/ptxdist.make +++ b/rules/ptxdist.make @@ -156,7 +156,7 @@ $(STATEDIR)/ptxdist.targetinstall: $(ptxdist_targetinstall_deps_default) ptxdist_clean: rm -rf $(STATEDIR)/ptxdist.* - rm -rf $(IMAGEDIR)/ptxdist_* + rm -rf $(PKGDIR)/ptxdist_* rm -rf $(PTXDIST_DIR) # vim: syntax=make diff --git a/rules/pureftpd.make b/rules/pureftpd.make index f3bc808d3..b0682cea7 100644 --- a/rules/pureftpd.make +++ b/rules/pureftpd.make @@ -183,7 +183,7 @@ endif pureftpd_clean: rm -rf $(STATEDIR)/pureftpd.* - rm -rf $(IMAGEDIR)/pureftpd_* + rm -rf $(PKGDIR)/pureftpd_* rm -rf $(PUREFTPD_DIR) # vim: syntax=make diff --git a/rules/python.make b/rules/python.make index 9101c4325..8e8bcee9b 100644 --- a/rules/python.make +++ b/rules/python.make @@ -151,7 +151,7 @@ $(STATEDIR)/python.targetinstall: $(python_targetinstall_deps_default) python_clean: rm -rf $(STATEDIR)/python.* - rm -rf $(IMAGEDIR)/python_* + rm -rf $(PKGDIR)/python_* rm -fr $(PYTHON_DIR) rm -fr $(PYTHON_BUILDDIR) diff --git a/rules/python24.make b/rules/python24.make index 388a26d77..f9a905539 100644 --- a/rules/python24.make +++ b/rules/python24.make @@ -182,7 +182,7 @@ $(STATEDIR)/python24.targetinstall: $(python24_targetinstall_deps_default) python24_clean: rm -rf $(STATEDIR)/python24.* - rm -rf $(IMAGEDIR)/python24_* + rm -rf $(PKGDIR)/python24_* rm -fr $(PYTHON24_DIR) # vim: syntax=make diff --git a/rules/qt.make b/rules/qt.make index 5907ba98b..e27c143c2 100644 --- a/rules/qt.make +++ b/rules/qt.make @@ -131,7 +131,7 @@ $(STATEDIR)/qt.targetinstall: $(qt_targetinstall_deps_default) qt_clean: rm -rf $(STATEDIR)/qt.* - rm -rf $(IMAGEDIR)/qt.* + rm -rf $(PKGDIR)/qt.* rm -rf $(QT_DIR) # vim: syntax=make diff --git a/rules/qte.make b/rules/qte.make index ce6e0dae3..63d6f3a88 100644 --- a/rules/qte.make +++ b/rules/qte.make @@ -404,7 +404,7 @@ endif qte_clean: rm -rf $(STATEDIR)/qte.* - rm -rf $(IMAGEDIR)/qte_* + rm -rf $(PKGDIR)/qte_* rm -rf $(QTE_DIR) # vim: syntax=make diff --git a/rules/qtopia.make b/rules/qtopia.make index 45405a715..3936c86ae 100644 --- a/rules/qtopia.make +++ b/rules/qtopia.make @@ -187,7 +187,7 @@ endif qtopia_clean: rm -rf $(STATEDIR)/qtopia.* - rm -rf $(IMAGEDIR)/qtopia_* + rm -rf $(PKGDIR)/qtopia_* rm -rf $(QTOPIA_DIR) # vim: syntax=make diff --git a/rules/rawrec.make b/rules/rawrec.make index aa008f79f..f2163e7be 100644 --- a/rules/rawrec.make +++ b/rules/rawrec.make @@ -131,7 +131,7 @@ endif rawrec_clean: rm -rf $(STATEDIR)/rawrec.* - rm -rf $(IMAGEDIR)/rawrec_* + rm -rf $(PKGDIR)/rawrec_* rm -rf $(RAWREC_DIR) # vim: syntax=make diff --git a/rules/readline.make b/rules/readline.make index 3244308de..77436f8cb 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -86,7 +86,7 @@ $(STATEDIR)/readline.targetinstall: readline_clean: rm -rf $(STATEDIR)/readline.* - rm -rf $(IMAGEDIR)/readline_* + rm -rf $(PKGDIR)/readline_* rm -rf $(READLINE_DIR) # vim: syntax=make diff --git a/rules/rootfs.make b/rules/rootfs.make index 61dd64aa9..a572a9997 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -887,6 +887,6 @@ endif rootfs_clean: rm -rf $(STATEDIR)/rootfs.* $(ROOTFS_DIR) - rm -rf $(IMAGEDIR)/rootfs_* + rm -rf $(PKGDIR)/rootfs_* # vim: syntax=make diff --git a/rules/rsync.make b/rules/rsync.make index 96722ba11..d0b02163b 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -208,7 +208,7 @@ endif rsync_clean: rm -rf $(STATEDIR)/rsync.* - rm -rf $(IMAGEDIR)/rsync_* + rm -rf $(PKGDIR)/rsync_* rm -rf $(RSYNC_DIR) # vim: syntax=make diff --git a/rules/rsync3.make b/rules/rsync3.make index 6c2ceb579..0a29ec0e5 100644 --- a/rules/rsync3.make +++ b/rules/rsync3.make @@ -208,7 +208,7 @@ endif rsync3_clean: rm -rf $(STATEDIR)/rsync3.* - rm -rf $(IMAGEDIR)/rsync3_* + rm -rf $(PKGDIR)/rsync3_* rm -rf $(RSYNC3_DIR) # vim: syntax=make diff --git a/rules/samba.make b/rules/samba.make index 109fe0b11..9f00248a5 100644 --- a/rules/samba.make +++ b/rules/samba.make @@ -218,7 +218,7 @@ endif samba_clean: rm -rf $(STATEDIR)/samba.* - rm -rf $(IMAGEDIR)/samba_* + rm -rf $(PKGDIR)/samba_* rm -rf $(SAMBA_DIR) # vim: syntax=make diff --git a/rules/schedutils.make b/rules/schedutils.make index a73374827..9a0b10963 100644 --- a/rules/schedutils.make +++ b/rules/schedutils.make @@ -138,7 +138,7 @@ endif schedutils_clean: rm -rf $(STATEDIR)/schedutils.* - rm -rf $(IMAGEDIR)/schedutils_* + rm -rf $(PKGDIR)/schedutils_* rm -rf $(SCHEDUTILS_DIR) # vim: syntax=make diff --git a/rules/screen.make b/rules/screen.make index 0d48f4e5d..65fa0ebd7 100644 --- a/rules/screen.make +++ b/rules/screen.make @@ -130,7 +130,7 @@ $(STATEDIR)/screen.targetinstall: $(screen_targetinstall_deps_default) screen_clean: rm -rf $(STATEDIR)/screen.* - rm -rf $(IMAGEDIR)/screen_* + rm -rf $(PKGDIR)/screen_* rm -rf $(SCREEN_DIR) # vim: syntax=make diff --git a/rules/sdl.make b/rules/sdl.make index c7262fa49..d296bed77 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -328,7 +328,7 @@ endif sdl_clean: rm -rf $(STATEDIR)/sdl.* - rm -rf $(IMAGEDIR)/sdl_* + rm -rf $(PKGDIR)/sdl_* rm -rf $(SDL_DIR) # vim: syntax=make diff --git a/rules/sdl_image.make b/rules/sdl_image.make index d7b768668..e0e4a7a8e 100644 --- a/rules/sdl_image.make +++ b/rules/sdl_image.make @@ -141,7 +141,7 @@ $(STATEDIR)/sdl_image.targetinstall: $(sdl_image_targetinstall_deps_default) sdl_image_clean: rm -rf $(STATEDIR)/sdl_image.* - rm -rf $(IMAGEDIR)/sdl_image_* + rm -rf $(PKGDIR)/sdl_image_* rm -rf $(SDL_IMAGE_DIR) # vim: syntax=make diff --git a/rules/sed.make b/rules/sed.make index 441fc3735..8e78ebc67 100644 --- a/rules/sed.make +++ b/rules/sed.make @@ -125,7 +125,7 @@ $(STATEDIR)/sed.targetinstall: $(sed_targetinstall_deps_default) sed_clean: rm -rf $(STATEDIR)/sed.* - rm -rf $(IMAGEDIR)/sed_* + rm -rf $(PKGDIR)/sed_* rm -rf $(SED_DIR) # vim: syntax=make diff --git a/rules/setmixer.make b/rules/setmixer.make index 9c52eb82f..bffabdd0e 100644 --- a/rules/setmixer.make +++ b/rules/setmixer.make @@ -119,7 +119,7 @@ $(STATEDIR)/setmixer.targetinstall: $(setmixer_targetinstall_deps_default) setmixer_clean: rm -rf $(STATEDIR)/setmixer.* - rm -rf $(IMAGEDIR)/setmixer_* + rm -rf $(PKGDIR)/setmixer_* rm -rf $(SETMIXER_DIR) # vim: syntax=make diff --git a/rules/setserial.make b/rules/setserial.make index 57cb9abfb..8f83e7191 100644 --- a/rules/setserial.make +++ b/rules/setserial.make @@ -126,7 +126,7 @@ $(STATEDIR)/setserial.targetinstall: $(setserial_targetinstall_deps_default) setserial_clean: rm -rf $(STATEDIR)/setserial.* - rm -rf $(IMAGEDIR)/setserial_* + rm -rf $(PKGDIR)/setserial_* rm -rf $(SETSERIAL_DIR) # vim: syntax=make diff --git a/rules/shorewall.make b/rules/shorewall.make index b71ef77d8..e26b0e516 100644 --- a/rules/shorewall.make +++ b/rules/shorewall.make @@ -120,7 +120,7 @@ $(STATEDIR)/shorewall.targetinstall: $(shorewall_targetinstall_deps_default) shorewall_clean: rm -rf $(STATEDIR)/shorewall.* - rm -rf $(IMAGEDIR)/shorewall_* + rm -rf $(PKGDIR)/shorewall_* rm -rf $(SHOREWALL_DIR) # vim: syntax=make diff --git a/rules/sjinn.make b/rules/sjinn.make index cb2c3fc25..52f7338a6 100644 --- a/rules/sjinn.make +++ b/rules/sjinn.make @@ -121,7 +121,7 @@ $(STATEDIR)/sjinn.targetinstall: $(sjinn_targetinstall_deps_default) sjinn_clean: rm -rf $(STATEDIR)/sjinn.* - rm -rf $(IMAGEDIR)/sjinn_* + rm -rf $(PKGDIR)/sjinn_* rm -rf $(SJINN_DIR) # vim: syntax=make diff --git a/rules/slang.make b/rules/slang.make index 34ee1ce9d..f9420c123 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -134,7 +134,7 @@ $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps_default) slang_clean: rm -rf $(STATEDIR)/slang.* - rm -rf $(IMAGEDIR)/slang_* + rm -rf $(PKGDIR)/slang_* rm -rf $(SLANG_DIR) # vim: syntax=make diff --git a/rules/smtpclient.make b/rules/smtpclient.make index 5590ecbf6..eecdae4a9 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -126,7 +126,7 @@ $(STATEDIR)/smtpclient.targetinstall: $(smtpclient_targetinstall_deps_default) smtpclient_clean: rm -rf $(STATEDIR)/smtpclient.* - rm -rf $(IMAGEDIR)/smtpclient_* + rm -rf $(PKGDIR)/smtpclient_* rm -rf $(SMTPCLIENT_DIR) # vim: syntax=make diff --git a/rules/sqlite.make b/rules/sqlite.make index c87bf6d5d..94217a2d1 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -172,6 +172,6 @@ $(STATEDIR)/sqlite.targetinstall: $(sqlite_targetinstall_deps_default) sqlite_clean: rm -rf $(STATEDIR)/sqlite.* $(SQLITE_DIR) - rm -rf $(IMAGEDIR)/sqlite_* + rm -rf $(PKGDIR)/sqlite_* # vim: syntax=make diff --git a/rules/ssmtp.make b/rules/ssmtp.make index bc34cab98..6029bfd87 100644 --- a/rules/ssmtp.make +++ b/rules/ssmtp.make @@ -145,7 +145,7 @@ $(STATEDIR)/ssmtp.targetinstall: $(ssmtp_targetinstall_deps_default) ssmtp_clean: rm -rf $(STATEDIR)/ssmtp.* - rm -rf $(IMAGEDIR)/ssmtp_* + rm -rf $(PKGDIR)/ssmtp_* rm -rf $(SSMTP_DIR) # vim: syntax=make diff --git a/rules/strace.make b/rules/strace.make index d4b83388a..bbf91203a 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -80,7 +80,7 @@ $(STATEDIR)/strace.targetinstall: strace_clean: rm -rf $(STATEDIR)/strace.* - rm -rf $(IMAGEDIR)/strace_* + rm -rf $(PKGDIR)/strace_* rm -rf $(STRACE_DIR) # vim: syntax=make diff --git a/rules/sun-java6-jre.make b/rules/sun-java6-jre.make index 7d2d75802..9400d72bc 100644 --- a/rules/sun-java6-jre.make +++ b/rules/sun-java6-jre.make @@ -150,7 +150,7 @@ $(STATEDIR)/sun-java6-jre.targetinstall: $(sun-java6-jre_targetinstall_deps_defa sun-java6-jre_clean: rm -rf $(STATEDIR)/sun-java6-jre.* - rm -rf $(IMAGEDIR)/sun-java6-jre_* + rm -rf $(PKGDIR)/sun-java6-jre_* rm -rf $(SUN_JAVA6_JRE_DIR) # vim: syntax=make diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 119836624..8f6ffa9db 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -132,7 +132,7 @@ endif sysfsutils_clean: rm -rf $(STATEDIR)/sysfsutils.* - rm -rf $(IMAGEDIR)/sysfsutils_* + rm -rf $(PKGDIR)/sysfsutils_* rm -rf $(SYSFSUTILS_DIR) # vim: syntax=make diff --git a/rules/syslogng.make b/rules/syslogng.make index 107d92ee3..6c287a52e 100644 --- a/rules/syslogng.make +++ b/rules/syslogng.make @@ -135,7 +135,7 @@ endif syslogng_clean: rm -rf $(STATEDIR)/syslogng.* - rm -rf $(IMAGEDIR)/syslogng_* + rm -rf $(PKGDIR)/syslogng_* rm -rf $(SYSLOGNG_DIR) # vim: syntax=make diff --git a/rules/sysvinit.make b/rules/sysvinit.make index 6aef84c0d..9f3c3a87b 100644 --- a/rules/sysvinit.make +++ b/rules/sysvinit.make @@ -181,7 +181,7 @@ endif sysvinit_clean: rm -rf $(STATEDIR)/sysvinit.* - rm -rf $(IMAGEDIR)/sysvinit_* + rm -rf $(PKGDIR)/sysvinit_* rm -rf $(SYSVINIT_DIR) # vim: syntax=make diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make index 7e36e210e..3d51a9398 100644 --- a/rules/tcpwrapper.make +++ b/rules/tcpwrapper.make @@ -118,7 +118,7 @@ endif tcpwrapper_clean: rm -rf $(STATEDIR)/tcpwrapper.* - rm -rf $(IMAGEDIR)/tcpwrapper_* + rm -rf $(PKGDIR)/tcpwrapper_* rm -rf $(TCPWRAPPER_DIR) # vim: syntax=make diff --git a/rules/termcap.make b/rules/termcap.make index 89c1f3f60..879c71484 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -127,7 +127,7 @@ endif termcap_clean: rm -rf $(STATEDIR)/termcap.* - rm -rf $(IMAGEDIR)/termcap_* + rm -rf $(PKGDIR)/termcap_* rm -rf $(TERMCAP_DIR) # vim: syntax=make diff --git a/rules/thttpd.make b/rules/thttpd.make index 0a0d95294..eddd4127f 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -157,7 +157,7 @@ endif thttpd_clean: rm -rf $(STATEDIR)/thttpd.* - rm -rf $(IMAGEDIR)/thttpd_* + rm -rf $(PKGDIR)/thttpd_* rm -rf $(THTTPD_DIR) # vim: syntax=make diff --git a/rules/timezone.make b/rules/timezone.make index 65f9ab97f..0115cd7ca 100644 --- a/rules/timezone.make +++ b/rules/timezone.make @@ -169,7 +169,7 @@ endif timezone_clean: rm -rf $(STATEDIR)/timezone.* - rm -rf $(IMAGEDIR)/timezone_* + rm -rf $(PKGDIR)/timezone_* rm -rf $(TIMEZONE_DIR) # vim: syntax=make diff --git a/rules/tk.make b/rules/tk.make index 05995080b..a4cb7bb48 100644 --- a/rules/tk.make +++ b/rules/tk.make @@ -129,7 +129,7 @@ $(STATEDIR)/tk.targetinstall: $(tk_targetinstall_deps_default) tk_clean: rm -rf $(STATEDIR)/tk.* - rm -rf $(IMAGEDIR)/tk_* + rm -rf $(PKGDIR)/tk_* rm -rf $(TK_DIR) # vim: syntax=make diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make index 165040579..ac96a86fc 100644 --- a/rules/troll-ftpd.make +++ b/rules/troll-ftpd.make @@ -119,7 +119,7 @@ $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps_default) troll-ftpd_clean: rm -rf $(STATEDIR)/troll-ftpd.* - rm -rf $(IMAGEDIR)/troll-ftpd_* + rm -rf $(PKGDIR)/troll-ftpd_* rm -rf $(TROLL_FTPD_DIR) # vim: syntax=make diff --git a/rules/tslib.make b/rules/tslib.make index ecb09ca20..56355be59 100644 --- a/rules/tslib.make +++ b/rules/tslib.make @@ -90,7 +90,7 @@ endif tslib_clean: rm -rf $(STATEDIR)/tslib.* - rm -rf $(IMAGEDIR)/tslib_* + rm -rf $(PKGDIR)/tslib_* rm -rf $(TSLIB_DIR) # vim: syntax=make diff --git a/rules/u-boot-v2.make b/rules/u-boot-v2.make index 4be276303..4250a8d5c 100644 --- a/rules/u-boot-v2.make +++ b/rules/u-boot-v2.make @@ -135,7 +135,7 @@ $(STATEDIR)/u-boot-v2.targetinstall: u-boot-v2_clean: rm -rf $(STATEDIR)/u-boot-v2.* - rm -rf $(IMAGEDIR)/u-boot-v2_* + rm -rf $(PKGDIR)/u-boot-v2_* rm -rf $(U_BOOT_V2_DIR) # ---------------------------------------------------------------------------- diff --git a/rules/u-boot.make b/rules/u-boot.make index 744ed1ec4..a44c7136e 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -116,7 +116,7 @@ $(STATEDIR)/u-boot.targetinstall: u-boot_clean: @rm -rf $(STATEDIR)/u-boot.* - @rm -rf $(IMAGEDIR)/u-boot_* + @rm -rf $(PKGDIR)/u-boot_* @rm -rf $(U_BOOT_DIR) # vim: syntax=make diff --git a/rules/uclibc.make b/rules/uclibc.make index 0da8ef91e..849ff3d14 100644 --- a/rules/uclibc.make +++ b/rules/uclibc.make @@ -125,6 +125,6 @@ endif uclibc_clean: rm -rf $(STATEDIR)/uclibc.* - rm -rf $(IMAGEDIR)/uclibc_* + rm -rf $(PKGDIR)/uclibc_* # vim: syntax=make diff --git a/rules/udev.make b/rules/udev.make index 85d6689e5..c789b5f81 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -262,7 +262,7 @@ endif udev_clean: rm -rf $(STATEDIR)/udev.* - rm -rf $(IMAGEDIR)/udev_* + rm -rf $(PKGDIR)/udev_* rm -rf $(UDEV_DIR) # vim: syntax=make diff --git a/rules/unionfs.make b/rules/unionfs.make index 4ef4503b8..24e0e5991 100644 --- a/rules/unionfs.make +++ b/rules/unionfs.make @@ -140,7 +140,7 @@ endif unionfs_clean: rm -rf $(STATEDIR)/unionfs.* - rm -rf $(IMAGEDIR)/unionfs_* + rm -rf $(PKGDIR)/unionfs_* rm -rf $(UNIONFS_DIR) # vim: syntax=make diff --git a/rules/unzip.make b/rules/unzip.make index 4d51d99da..586cd16ba 100644 --- a/rules/unzip.make +++ b/rules/unzip.make @@ -124,7 +124,7 @@ endif unzip_clean: rm -rf $(STATEDIR)/unzip.* - rm -rf $(IMAGEDIR)/unzip_* + rm -rf $(PKGDIR)/unzip_* rm -rf $(UNZIP_DIR) # vim: syntax=make diff --git a/rules/urshd.make b/rules/urshd.make index 6494c4a87..637c0b65f 100644 --- a/rules/urshd.make +++ b/rules/urshd.make @@ -125,7 +125,7 @@ $(STATEDIR)/urshd.targetinstall: urshd_clean: rm -rf $(STATEDIR)/urshd.* - rm -rf $(IMAGEDIR)/urshd_* + rm -rf $(PKGDIR)/urshd_* rm -rf $(URSHD_DIR) # vim: syntax=make diff --git a/rules/usbutils.make b/rules/usbutils.make index cb191cd8f..999ac38db 100644 --- a/rules/usbutils.make +++ b/rules/usbutils.make @@ -127,7 +127,7 @@ endif usbutils_clean: rm -rf $(STATEDIR)/usbutils.* - rm -rf $(IMAGEDIR)/usbutils_* + rm -rf $(PKGDIR)/usbutils_* rm -rf $(USBUTILS_DIR) # vim: syntax=make diff --git a/rules/usplash.make b/rules/usplash.make index 404434b1d..eba06ff2e 100644 --- a/rules/usplash.make +++ b/rules/usplash.make @@ -136,7 +136,7 @@ $(STATEDIR)/usplash.targetinstall: usplash_clean: rm -rf $(STATEDIR)/usplash.* - rm -rf $(IMAGEDIR)/usplash_* + rm -rf $(PKGDIR)/usplash_* rm -rf $(USPLASH_DIR) # vim: syntax=make diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index d9cf047f0..098557f17 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -154,7 +154,7 @@ endif util-linux-ng_clean: rm -rf $(STATEDIR)/util-linux-ng.* - rm -rf $(IMAGEDIR)/util-linux-ng_* + rm -rf $(PKGDIR)/util-linux-ng_* rm -rf $(UTIL_LINUX_NG_DIR) # vim: syntax=make diff --git a/rules/util-linux.make b/rules/util-linux.make index 88a4e0b69..41b72f54f 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -159,7 +159,7 @@ endif util-linux_clean: rm -rf $(STATEDIR)/util-linux.* - rm -rf $(IMAGEDIR)/util-linux_* + rm -rf $(PKGDIR)/util-linux_* rm -rf $(UTIL_LINUX_DIR) # vim: syntax=make diff --git a/rules/valgrind.make b/rules/valgrind.make index cb852737a..1c630a71b 100644 --- a/rules/valgrind.make +++ b/rules/valgrind.make @@ -87,7 +87,7 @@ $(STATEDIR)/valgrind.targetinstall: valgrind_clean: rm -rf $(STATEDIR)/valgrind.* - rm -rf $(IMAGEDIR)/valgrind_* + rm -rf $(PKGDIR)/valgrind_* rm -rf $(VALGRIND_DIR) # vim: syntax=make diff --git a/rules/vice.make b/rules/vice.make index 57062d8f7..1a1e1beba 100644 --- a/rules/vice.make +++ b/rules/vice.make @@ -140,7 +140,7 @@ $(STATEDIR)/vice.targetinstall: $(vice_targetinstall_deps_default) vice_clean: rm -rf $(STATEDIR)/vice.* - rm -rf $(IMAGEDIR)/vice_* + rm -rf $(PKGDIR)/vice_* rm -rf $(VICE_DIR) # vim: syntax=make diff --git a/rules/wget.make b/rules/wget.make index 2023d506e..185d1df40 100644 --- a/rules/wget.make +++ b/rules/wget.make @@ -128,7 +128,7 @@ $(STATEDIR)/wget.targetinstall: $(wget_targetinstall_deps_default) wget_clean: rm -rf $(STATEDIR)/wget.* - rm -rf $(IMAGEDIR)/wget_* + rm -rf $(PKGDIR)/wget_* rm -rf $(WGET_DIR) # vim: syntax=make diff --git a/rules/wine.make b/rules/wine.make index eee0b002c..b8d37bc56 100644 --- a/rules/wine.make +++ b/rules/wine.make @@ -97,7 +97,7 @@ $(STATEDIR)/wine.targetinstall: wine_clean: rm -rf $(STATEDIR)/wine.* - rm -rf $(IMAGEDIR)/wine_* + rm -rf $(PKGDIR)/wine_* rm -rf $(WINE_DIR) # vim: syntax=make diff --git a/rules/wireless.make b/rules/wireless.make index e957e166c..c4d51a42c 100644 --- a/rules/wireless.make +++ b/rules/wireless.make @@ -129,7 +129,7 @@ endif wireless_clean: rm -rf $(STATEDIR)/wireless.* - rm -rf $(IMAGEDIR)/wireless_* + rm -rf $(PKGDIR)/wireless_* rm -rf $(WIRELESS_DIR) # vim: syntax=make diff --git a/rules/wireshark.make b/rules/wireshark.make index 399eef80b..c665fc20a 100644 --- a/rules/wireshark.make +++ b/rules/wireshark.make @@ -183,7 +183,7 @@ $(STATEDIR)/wireshark.targetinstall: $(wireshark_targetinstall_deps_default) wireshark_clean: rm -rf $(STATEDIR)/wireshark.* - rm -rf $(IMAGEDIR)/wireshark_* + rm -rf $(PKGDIR)/wireshark_* rm -rf $(WIRESHARK_DIR) # vim: syntax=make diff --git a/rules/wxWindows.make b/rules/wxWindows.make index 52492549c..398433271 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -130,7 +130,7 @@ $(STATEDIR)/wxWindows.targetinstall: $(wxWindows_targetinstall_deps_default) wxWindows_clean: rm -rf $(STATEDIR)/wxWindows.* - rm -rf $(IMAGEDIR)/wxWindows_* + rm -rf $(PKGDIR)/wxWindows_* rm -rf $(WXWINDOWS_DIR) # vim: syntax=make diff --git a/rules/xawtv.make b/rules/xawtv.make index b398d6665..e91716658 100644 --- a/rules/xawtv.make +++ b/rules/xawtv.make @@ -164,7 +164,7 @@ $(STATEDIR)/xawtv.targetinstall: $(xawtv_targetinstall_deps_default) xawtv_clean: rm -rf $(STATEDIR)/xawtv.* - rm -rf $(IMAGEDIR)/xawtv_* + rm -rf $(PKGDIR)/xawtv_* rm -rf $(XAWTV_DIR) # vim: syntax=make diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make index 5ff524107..b8a107662 100644 --- a/rules/xcb-proto.make +++ b/rules/xcb-proto.make @@ -100,7 +100,7 @@ $(STATEDIR)/xcb-proto.targetinstall: xcb-proto_clean: rm -rf $(STATEDIR)/xcb-proto.* - rm -rf $(IMAGEDIR)/xcb-proto_* + rm -rf $(PKGDIR)/xcb-proto_* rm -rf $(XCB_PROTO_DIR) # vim: syntax=make diff --git a/rules/xcursor-transparent-theme.make b/rules/xcursor-transparent-theme.make index 140eda0fb..ad6f8cf13 100644 --- a/rules/xcursor-transparent-theme.make +++ b/rules/xcursor-transparent-theme.make @@ -139,7 +139,7 @@ $(STATEDIR)/xcursor-transparent-theme.targetinstall: $(xcursor-transparent-theme xcursor-transparent-theme_clean: rm -rf $(STATEDIR)/xcursor-transparent-theme.* - rm -rf $(IMAGEDIR)/xcursor-transparent-theme_* + rm -rf $(PKGDIR)/xcursor-transparent-theme_* rm -rf $(XCURSOR_TRANSPARENT_THEME_DIR) # vim: syntax=make diff --git a/rules/xerces.make b/rules/xerces.make index a5d103404..6359b7e8e 100644 --- a/rules/xerces.make +++ b/rules/xerces.make @@ -136,7 +136,7 @@ $(STATEDIR)/xerces.targetinstall: $(xerces_targetinstall_deps_default) xerces_clean: rm -rf $(STATEDIR)/xerces.* - rm -rf $(IMAGEDIR)/xerces_* + rm -rf $(PKGDIR)/xerces_* rm -rf $(XERCES_DIR) # vim: syntax=make diff --git a/rules/xli.make b/rules/xli.make index 5d0cd5f89..01ce513c7 100644 --- a/rules/xli.make +++ b/rules/xli.make @@ -118,7 +118,7 @@ $(STATEDIR)/xli.targetinstall: $(xli_targetinstall_deps_default) xli_clean: rm -rf $(STATEDIR)/xli.* - rm -rf $(IMAGEDIR)/xli_* + rm -rf $(PKGDIR)/xli_* rm -rf $(XLI_DIR) # vim: syntax=make diff --git a/rules/xmlbench.make b/rules/xmlbench.make index 9a25f4115..86d2f7868 100644 --- a/rules/xmlbench.make +++ b/rules/xmlbench.make @@ -133,7 +133,7 @@ $(STATEDIR)/xmlbench.targetinstall: $(xmlbench_targetinstall_deps_default) xmlbench_clean: rm -rf $(STATEDIR)/xmlbench.* - rm -rf $(IMAGEDIR)/xmlbench_* + rm -rf $(PKGDIR)/xmlbench_* rm -rf $(XMLBENCH_DIR) # vim: syntax=make diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make index cfb13beca..5bea10b9e 100644 --- a/rules/xmlstarlet.make +++ b/rules/xmlstarlet.make @@ -130,7 +130,7 @@ $(STATEDIR)/xmlstarlet.targetinstall: $(xmlstarlet_targetinstall_deps_default) xmlstarlet_clean: rm -rf $(STATEDIR)/xmlstarlet.* - rm -rf $(IMAGEDIR)/xmlstarlet_* + rm -rf $(PKGDIR)/xmlstarlet_* rm -rf $(XMLSTARLET_DIR) # vim: syntax=make diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make index e65c504cf..9377a245b 100644 --- a/rules/xorg-app-mkfontdir.make +++ b/rules/xorg-app-mkfontdir.make @@ -129,7 +129,7 @@ $(STATEDIR)/xorg-app-mkfontdir.targetinstall: $(xorg-app-mkfontdir_targetinstall xorg-app-mkfontdir_clean: rm -rf $(STATEDIR)/xorg-app-mkfontdir.* - rm -rf $(IMAGEDIR)/xorg-app-mkfontdir_* + rm -rf $(PKGDIR)/xorg-app-mkfontdir_* rm -rf $(XORG_APP_MKFONTDIR_DIR) # vim: syntax=make diff --git a/rules/xorg-app-mkfontscale.make b/rules/xorg-app-mkfontscale.make index 34c3397d9..4f077c22b 100644 --- a/rules/xorg-app-mkfontscale.make +++ b/rules/xorg-app-mkfontscale.make @@ -129,7 +129,7 @@ $(STATEDIR)/xorg-app-mkfontscale.targetinstall: $(xorg-app-mkfontscale_targetins xorg-app-mkfontscale_clean: rm -rf $(STATEDIR)/xorg-app-mkfontscale.* - rm -rf $(IMAGEDIR)/xorg-app-mkfontscale_* + rm -rf $(PKGDIR)/xorg-app-mkfontscale_* rm -rf $(XORG_APP_MKFONTSCALE_DIR) # vim: syntax=make diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make index 77a875491..87f835245 100644 --- a/rules/xorg-app-rgb.make +++ b/rules/xorg-app-rgb.make @@ -131,7 +131,7 @@ $(STATEDIR)/xorg-app-rgb.targetinstall: $(xorg-app-rgb_targetinstall_deps_defaul xorg-app-rgb_clean: rm -rf $(STATEDIR)/xorg-app-rgb.* - rm -rf $(IMAGEDIR)/xorg-app-rgb_* + rm -rf $(PKGDIR)/xorg-app-rgb_* rm -rf $(XORG_APP_RGB_DIR) # vim: syntax=make diff --git a/rules/xorg-app-setxkbmap.make b/rules/xorg-app-setxkbmap.make index 6acaa39d8..a2796534a 100644 --- a/rules/xorg-app-setxkbmap.make +++ b/rules/xorg-app-setxkbmap.make @@ -130,7 +130,7 @@ $(STATEDIR)/xorg-app-setxkbmap.targetinstall: $(xorg-app-setxkbmap_targetinstall xorg-app-setxkbmap_clean: rm -rf $(STATEDIR)/xorg-app-setxkbmap.* - rm -rf $(IMAGEDIR)/xorg-app-setxkbmap_* + rm -rf $(PKGDIR)/xorg-app-setxkbmap_* rm -rf $(XORG_APP_SETXKBMAP_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xauth.make b/rules/xorg-app-xauth.make index 4c0bc2290..6dbc43b69 100644 --- a/rules/xorg-app-xauth.make +++ b/rules/xorg-app-xauth.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-app-xauth.targetinstall: $(xorg-app-xauth_targetinstall_deps_de xorg-app-xauth_clean: rm -rf $(STATEDIR)/xorg-app-xauth.* - rm -rf $(IMAGEDIR)/xorg-app-xauth_* + rm -rf $(PKGDIR)/xorg-app-xauth_* rm -rf $(XORG_APP_XAUTH_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make index 24bcd5b7e..5dd88d939 100644 --- a/rules/xorg-app-xdm.make +++ b/rules/xorg-app-xdm.make @@ -141,7 +141,7 @@ $(STATEDIR)/xorg-app-xdm.targetinstall: $(xorg-app-xdm_targetinstall_deps_defaul xorg-app-xdm_clean: rm -rf $(STATEDIR)/xorg-app-xdm.* - rm -rf $(IMAGEDIR)/xorg-app-xdm_* + rm -rf $(PKGDIR)/xorg-app-xdm_* rm -rf $(XORG_APP_XDM_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make index 004aa65b0..ed0d5e2aa 100644 --- a/rules/xorg-app-xeyes.make +++ b/rules/xorg-app-xeyes.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-app-xeyes.targetinstall: $(xorg-app-xeyes_targetinstall_deps_de xorg-app-xeyes_clean: rm -rf $(STATEDIR)/xorg-app-xeyes.* - rm -rf $(IMAGEDIR)/xorg-app-xeyes_* + rm -rf $(PKGDIR)/xorg-app-xeyes_* rm -rf $(XORG_APP_XEYES_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make index c6b150403..d2e4f4700 100644 --- a/rules/xorg-app-xhost.make +++ b/rules/xorg-app-xhost.make @@ -135,7 +135,7 @@ $(STATEDIR)/xorg-app-xhost.targetinstall: $(xorg-app-xhost_targetinstall_deps_de xorg-app-xhost_clean: rm -rf $(STATEDIR)/xorg-app-xhost.* - rm -rf $(IMAGEDIR)/xorg-app-xhost_* + rm -rf $(PKGDIR)/xorg-app-xhost_* rm -rf $(XORG_APP_XHOST_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make index 3a4b759db..4421b85f9 100644 --- a/rules/xorg-app-xinit.make +++ b/rules/xorg-app-xinit.make @@ -152,7 +152,7 @@ $(STATEDIR)/xorg-app-xinit.targetinstall: $(xorg-app-xinit_targetinstall_deps_de xorg-app-xinit_clean: rm -rf $(STATEDIR)/xorg-app-xinit.* - rm -rf $(IMAGEDIR)/xorg-app-xinit_* + rm -rf $(PKGDIR)/xorg-app-xinit_* rm -rf $(XORG_APP_XINIT_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xkbcomp.make b/rules/xorg-app-xkbcomp.make index 9c41d3cd8..5b76f28ee 100644 --- a/rules/xorg-app-xkbcomp.make +++ b/rules/xorg-app-xkbcomp.make @@ -130,7 +130,7 @@ $(STATEDIR)/xorg-app-xkbcomp.targetinstall: $(xorg-app-xkbcomp_targetinstall_dep xorg-app-xkbcomp_clean: rm -rf $(STATEDIR)/xorg-app-xkbcomp.* - rm -rf $(IMAGEDIR)/xorg-app-xkbcomp_* + rm -rf $(PKGDIR)/xorg-app-xkbcomp_* rm -rf $(XORG_APP_XKBCOMP_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xrdb.make b/rules/xorg-app-xrdb.make index 47eacfa12..ddcf1833e 100644 --- a/rules/xorg-app-xrdb.make +++ b/rules/xorg-app-xrdb.make @@ -125,7 +125,7 @@ $(STATEDIR)/xorg-app-xrdb.targetinstall: $(xorg-app-xrdb_targetinstall_deps_defa xorg-app-xrdb_clean: rm -rf $(STATEDIR)/xorg-app-xrdb.* - rm -rf $(IMAGEDIR)/xorg-app-xrdb_* + rm -rf $(PKGDIR)/xorg-app-xrdb_* rm -rf $(XORG_APP_XRDB_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xset.make b/rules/xorg-app-xset.make index e6a6420ac..f42c644a8 100644 --- a/rules/xorg-app-xset.make +++ b/rules/xorg-app-xset.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-app-xset.targetinstall: $(xorg-app-xset_targetinstall_deps_defa xorg-app-xset_clean: rm -rf $(STATEDIR)/xorg-app-xset.* - rm -rf $(IMAGEDIR)/xorg-app-xset_* + rm -rf $(PKGDIR)/xorg-app-xset_* rm -rf $(XORG_APP_XSET_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make index 0f4c54639..b1bd6599e 100644 --- a/rules/xorg-app-xsetroot.make +++ b/rules/xorg-app-xsetroot.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-app-xsetroot.targetinstall: $(xorg-app-xsetroot_targetinstall_d xorg-app-xsetroot_clean: rm -rf $(STATEDIR)/xorg-app-xsetroot.* - rm -rf $(IMAGEDIR)/xorg-app-xsetroot_* + rm -rf $(PKGDIR)/xorg-app-xsetroot_* rm -rf $(XORG_APP_XSETROOT_DIR) # vim: syntax=make diff --git a/rules/xorg-app-xvinfo.make b/rules/xorg-app-xvinfo.make index 8822806c9..a5d935151 100644 --- a/rules/xorg-app-xvinfo.make +++ b/rules/xorg-app-xvinfo.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-app-xvinfo.targetinstall: $(xorg-app-xvinfo_targetinstall_deps_ xorg-app-xvinfo_clean: rm -rf $(STATEDIR)/xorg-app-xvinfo.* - rm -rf $(IMAGEDIR)/xorg-app-xvinfo_* + rm -rf $(PKGDIR)/xorg-app-xvinfo_* rm -rf $(XORG_APP_XVINFO_DIR) # vim: syntax=make diff --git a/rules/xorg-cursor.make b/rules/xorg-cursor.make index 17473b9f1..663d518e0 100644 --- a/rules/xorg-cursor.make +++ b/rules/xorg-cursor.make @@ -106,7 +106,7 @@ $(STATEDIR)/xorg-cursor.targetinstall: $(xorg-cursor_targetinstall_deps_default) xorg-cursor_clean: rm -rf $(STATEDIR)/xorg-cursor.* - rm -rf $(IMAGEDIR)/xorg-cursor_* + rm -rf $(PKGDIR)/xorg-cursor_* rm -rf $(XORG_CURSOR_DIR) # vim: syntax=make diff --git a/rules/xorg-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make index b51364fae..0b05edd87 100644 --- a/rules/xorg-data-xbitmaps.make +++ b/rules/xorg-data-xbitmaps.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-data-xbitmaps.targetinstall: $(xorg-data-xbitmaps_targetinstall xorg-data-xbitmaps_clean: rm -rf $(STATEDIR)/xorg-data-xbitmaps.* - rm -rf $(IMAGEDIR)/xorg-data-xbitmaps_* + rm -rf $(PKGDIR)/xorg-data-xbitmaps_* rm -rf $(XORG_DATA_XBITMAPS_DIR) # vim: syntax=make diff --git a/rules/xorg-data-xkbdata.make b/rules/xorg-data-xkbdata.make index 79366f68f..07f1485a2 100644 --- a/rules/xorg-data-xkbdata.make +++ b/rules/xorg-data-xkbdata.make @@ -275,7 +275,7 @@ $(STATEDIR)/xorg-data-xkbdata.targetinstall: $(xorg-data-xkbdata_targetinstall_d xorg-data-xkbdata_clean: rm -rf $(STATEDIR)/xorg-data-xkbdata.* - rm -rf $(IMAGEDIR)/xorg-data-xkbdata_* + rm -rf $(PKGDIR)/xorg-data-xkbdata_* rm -rf $(XORG_DATA_XKBDATA_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make index 17641f5bd..fc19c0877 100644 --- a/rules/xorg-driver-input-evdev.make +++ b/rules/xorg-driver-input-evdev.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-driver-input-evdev.targetinstall: $(xorg-driver-input-evdev_tar xorg-driver-input-evdev_clean: rm -rf $(STATEDIR)/xorg-driver-input-evdev.* - rm -rf $(IMAGEDIR)/xorg-driver-input-evdev_* + rm -rf $(PKGDIR)/xorg-driver-input-evdev_* rm -rf $(XORG_DRIVER_INPUT_EVDEV_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make index 527f5c0ca..a39fa4ff4 100644 --- a/rules/xorg-driver-input-keyboard.make +++ b/rules/xorg-driver-input-keyboard.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-driver-input-keyboard.targetinstall: $(xorg-driver-input-keyboa xorg-driver-input-keyboard_clean: rm -rf $(STATEDIR)/xorg-driver-input-keyboard.* - rm -rf $(IMAGEDIR)/xorg-driver-input-keyboard_* + rm -rf $(PKGDIR)/xorg-driver-input-keyboard_* rm -rf $(XORG_DRIVER_INPUT_KEYBOARD_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make index 4e3e292b6..f740dd61e 100644 --- a/rules/xorg-driver-input-mouse.make +++ b/rules/xorg-driver-input-mouse.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-driver-input-mouse.targetinstall: $(xorg-driver-input-mouse_tar xorg-driver-input-mouse_clean: rm -rf $(STATEDIR)/xorg-driver-input-mouse.* - rm -rf $(IMAGEDIR)/xorg-driver-input-mouse_* + rm -rf $(PKGDIR)/xorg-driver-input-mouse_* rm -rf $(XORG_DRIVER_INPUT_MOUSE_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make index cbb8e60ae..6ac4ad0c0 100644 --- a/rules/xorg-driver-input-tslib.make +++ b/rules/xorg-driver-input-tslib.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-driver-input-tslib.targetinstall: $(xorg-driver-input-tslib_tar xorg-driver-input-tslib_clean: rm -rf $(STATEDIR)/xorg-driver-input-tslib.* - rm -rf $(IMAGEDIR)/xorg-driver-input-tslib_* + rm -rf $(PKGDIR)/xorg-driver-input-tslib_* rm -rf $(XORG_DRIVER_INPUT_TSLIB_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make index d1822e681..220af5b99 100644 --- a/rules/xorg-driver-input-void.make +++ b/rules/xorg-driver-input-void.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-driver-input-void.targetinstall: $(xorg-driver-input-void_targe xorg-driver-input-void_clean: rm -rf $(STATEDIR)/xorg-driver-input-void.* - rm -rf $(IMAGEDIR)/xorg-driver-input-void_* + rm -rf $(PKGDIR)/xorg-driver-input-void_* rm -rf $(XORG_DRIVER_INPUT_VOID_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make index e62bb030e..491c546c1 100644 --- a/rules/xorg-driver-video-apm.make +++ b/rules/xorg-driver-video-apm.make @@ -130,7 +130,7 @@ $(STATEDIR)/xorg-driver-video-apm.targetinstall: $(xorg-driver-video-apm_targeti xorg-driver-video-apm_clean: rm -rf $(STATEDIR)/xorg-driver-video-apm.* - rm -rf $(IMAGEDIR)/xorg-driver-video-apm_* + rm -rf $(PKGDIR)/xorg-driver-video-apm_* rm -rf $(XORG_DRIVER_VIDEO_APM_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make index c646ef538..0c8971477 100644 --- a/rules/xorg-driver-video-ati.make +++ b/rules/xorg-driver-video-ati.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-driver-video-ati.targetinstall: $(xorg-driver-video-ati_targeti xorg-driver-video-ati_clean: rm -rf $(STATEDIR)/xorg-driver-video-ati.* - rm -rf $(IMAGEDIR)/xorg-driver-video-ati_* + rm -rf $(PKGDIR)/xorg-driver-video-ati_* rm -rf $(XORG_DRIVER_VIDEO_ATI_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make index 41a10eb44..3dc81523e 100644 --- a/rules/xorg-driver-video-dummy.make +++ b/rules/xorg-driver-video-dummy.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-driver-video-dummy.targetinstall: $(xorg-driver-video-dummy_tar xorg-driver-video-dummy_clean: rm -rf $(STATEDIR)/xorg-driver-video-dummy.* - rm -rf $(IMAGEDIR)/xorg-driver-video-dummy_* + rm -rf $(PKGDIR)/xorg-driver-video-dummy_* rm -rf $(XORG_DRIVER_VIDEO_DUMMY_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make index 02b6a9b0c..a26d55ab2 100644 --- a/rules/xorg-driver-video-fbdev.make +++ b/rules/xorg-driver-video-fbdev.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-driver-video-fbdev.targetinstall: $(xorg-driver-video-fbdev_tar xorg-driver-video-fbdev_clean: rm -rf $(STATEDIR)/xorg-driver-video-fbdev.* - rm -rf $(IMAGEDIR)/xorg-driver-video-fbdev_* + rm -rf $(PKGDIR)/xorg-driver-video-fbdev_* rm -rf $(XORG_DRIVER_VIDEO_FBDEV_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-i810.make b/rules/xorg-driver-video-i810.make index 6fcba9133..2fd075ed6 100644 --- a/rules/xorg-driver-video-i810.make +++ b/rules/xorg-driver-video-i810.make @@ -151,7 +151,7 @@ $(STATEDIR)/xorg-driver-video-i810.targetinstall: $(xorg-driver-video-i810_targe xorg-driver-video-i810_clean: rm -rf $(STATEDIR)/xorg-driver-video-i810.* - rm -rf $(IMAGEDIR)/xorg-driver-video-i810_* + rm -rf $(PKGDIR)/xorg-driver-video-i810_* rm -rf $(XORG_DRIVER_VIDEO_I810_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-nsc.make b/rules/xorg-driver-video-nsc.make index 070b3e04c..533976eb5 100644 --- a/rules/xorg-driver-video-nsc.make +++ b/rules/xorg-driver-video-nsc.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-driver-video-nsc.targetinstall: $(xorg-driver-video-nsc_targeti xorg-driver-video-nsc_clean: rm -rf $(STATEDIR)/xorg-driver-video-nsc.* - rm -rf $(IMAGEDIR)/xorg-driver-video-nsc_* + rm -rf $(PKGDIR)/xorg-driver-video-nsc_* rm -rf $(XORG_DRIVER_VIDEO_NSC_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-v4l.make b/rules/xorg-driver-video-v4l.make index 6ab0b4329..4ecf28177 100644 --- a/rules/xorg-driver-video-v4l.make +++ b/rules/xorg-driver-video-v4l.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-driver-video-v4l.targetinstall: $(xorg-driver-video-v4l_targeti xorg-driver-video-v4l_clean: rm -rf $(STATEDIR)/xorg-driver-video-v4l.* - rm -rf $(IMAGEDIR)/xorg-driver-video-v4l_* + rm -rf $(PKGDIR)/xorg-driver-video-v4l_* rm -rf $(XORG_DRIVER_VIDEO_V4L_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-vesa.make b/rules/xorg-driver-video-vesa.make index 7f31fad25..1bf451cc3 100644 --- a/rules/xorg-driver-video-vesa.make +++ b/rules/xorg-driver-video-vesa.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-driver-video-vesa.targetinstall: $(xorg-driver-video-vesa_targe xorg-driver-video-vesa_clean: rm -rf $(STATEDIR)/xorg-driver-video-vesa.* - rm -rf $(IMAGEDIR)/xorg-driver-video-vesa_* + rm -rf $(PKGDIR)/xorg-driver-video-vesa_* rm -rf $(XORG_DRIVER_VIDEO_VESA_DIR) # vim: syntax=make diff --git a/rules/xorg-driver-video-vga.make b/rules/xorg-driver-video-vga.make index 9f92a8239..f6ab1eee1 100644 --- a/rules/xorg-driver-video-vga.make +++ b/rules/xorg-driver-video-vga.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-driver-video-vga.targetinstall: $(xorg-driver-video-vga_targeti xorg-driver-video-vga_clean: rm -rf $(STATEDIR)/xorg-driver-video-vga.* - rm -rf $(IMAGEDIR)/xorg-driver-video-vga_* + rm -rf $(PKGDIR)/xorg-driver-video-vga_* rm -rf $(XORG_DRIVER_VIDEO_VGA_DIR) # vim: syntax=make diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make index a5021cb1f..1d9a0104c 100644 --- a/rules/xorg-font-adobe-100dpi.make +++ b/rules/xorg-font-adobe-100dpi.make @@ -143,7 +143,7 @@ endif xorg-font-adobe-100dpi_clean: rm -rf $(STATEDIR)/xorg-font-adobe-100dpi.* - rm -rf $(IMAGEDIR)/xorg-font-adobe-100dpi_* + rm -rf $(PKGDIR)/xorg-font-adobe-100dpi_* rm -rf $(XORG_FONT_ADOBE_100DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make index fb2f0cb6f..9708664be 100644 --- a/rules/xorg-font-adobe-75dpi.make +++ b/rules/xorg-font-adobe-75dpi.make @@ -144,7 +144,7 @@ endif xorg-font-adobe-75dpi_clean: rm -rf $(STATEDIR)/xorg-font-adobe-75dpi.* - rm -rf $(IMAGEDIR)/xorg-font-adobe-75dpi_* + rm -rf $(PKGDIR)/xorg-font-adobe-75dpi_* rm -rf $(XORG_FONT_ADOBE_75DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make index 2e7cde0aa..fbb31a4f0 100644 --- a/rules/xorg-font-adobe-utopia-100dpi.make +++ b/rules/xorg-font-adobe-utopia-100dpi.make @@ -144,7 +144,7 @@ endif xorg-font-adobe-utopia-100dpi_clean: rm -rf $(STATEDIR)/xorg-font-adobe-utopia-100dpi.* - rm -rf $(IMAGEDIR)/xorg-font-adobe-utopia-100dpi_* + rm -rf $(PKGDIR)/xorg-font-adobe-utopia-100dpi_* rm -rf $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make index 451a1147e..5ea5f5b32 100644 --- a/rules/xorg-font-adobe-utopia-75dpi.make +++ b/rules/xorg-font-adobe-utopia-75dpi.make @@ -144,7 +144,7 @@ endif xorg-font-adobe-utopia-75dpi_clean: rm -rf $(STATEDIR)/xorg-font-adobe-utopia-75dpi.* - rm -rf $(IMAGEDIR)/xorg-font-adobe-utopia-75dpi_* + rm -rf $(PKGDIR)/xorg-font-adobe-utopia-75dpi_* rm -rf $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make index edc1e5fac..2c3b2b174 100644 --- a/rules/xorg-font-adobe-utopia-type1.make +++ b/rules/xorg-font-adobe-utopia-type1.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-type1.targetinstall: $(xorg-font-adobe-utopia xorg-font-adobe-utopia-type1_clean: rm -rf $(STATEDIR)/xorg-font-adobe-utopia-type1.* - rm -rf $(IMAGEDIR)/xorg-font-adobe-utopia-type1_* + rm -rf $(PKGDIR)/xorg-font-adobe-utopia-type1_* rm -rf $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR) # vim: syntax=make diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make index 65799ab2b..222f371ca 100644 --- a/rules/xorg-font-alias.make +++ b/rules/xorg-font-alias.make @@ -135,7 +135,7 @@ $(STATEDIR)/xorg-font-alias.targetinstall: $(xorg-font-alias_targetinstall_deps_ xorg-font-alias_clean: rm -rf $(STATEDIR)/xorg-font-alias.* - rm -rf $(IMAGEDIR)/xorg-font-alias_* + rm -rf $(PKGDIR)/xorg-font-alias_* rm -rf $(XORG_FONT_ALIAS_DIR) # vim: syntax=make diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make index 27de86807..ad8ad2e98 100644 --- a/rules/xorg-font-arabic-misc.make +++ b/rules/xorg-font-arabic-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-arabic-misc.targetinstall: $(xorg-font-arabic-misc_targeti xorg-font-arabic-misc_clean: rm -rf $(STATEDIR)/xorg-font-arabic-misc.* - rm -rf $(IMAGEDIR)/xorg-font-arabic-misc_* + rm -rf $(PKGDIR)/xorg-font-arabic-misc_* rm -rf $(XORG_FONT_ARABIC_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make index a45c1cc00..c3d2e8c98 100644 --- a/rules/xorg-font-bh-100dpi.make +++ b/rules/xorg-font-bh-100dpi.make @@ -143,7 +143,7 @@ endif xorg-font-bh-100dpi_clean: rm -rf $(STATEDIR)/xorg-font-bh-100dpi.* - rm -rf $(IMAGEDIR)/xorg-font-bh-100dpi_* + rm -rf $(PKGDIR)/xorg-font-bh-100dpi_* rm -rf $(XORG_FONT_BH_100DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make index 7505fdfbb..27d592852 100644 --- a/rules/xorg-font-bh-75dpi.make +++ b/rules/xorg-font-bh-75dpi.make @@ -143,7 +143,7 @@ endif xorg-font-bh-75dpi_clean: rm -rf $(STATEDIR)/xorg-font-bh-75dpi.* - rm -rf $(IMAGEDIR)/xorg-font-bh-75dpi_* + rm -rf $(PKGDIR)/xorg-font-bh-75dpi_* rm -rf $(XORG_FONT_BH_75DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make index 8caf7799b..890bb8bb5 100644 --- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make @@ -143,7 +143,7 @@ endif xorg-font-bh-lucidatypewriter-100dpi_clean: rm -rf $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.* - rm -rf $(IMAGEDIR)/xorg-font-bh-lucidatypewriter-100dpi_* + rm -rf $(PKGDIR)/xorg-font-bh-lucidatypewriter-100dpi_* rm -rf $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make index 5929bbcd5..d97fbac09 100644 --- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make @@ -143,7 +143,7 @@ endif xorg-font-bh-lucidatypewriter-75dpi_clean: rm -rf $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.* - rm -rf $(IMAGEDIR)/xorg-font-bh-lucidatypewriter-75dpi_* + rm -rf $(PKGDIR)/xorg-font-bh-lucidatypewriter-75dpi_* rm -rf $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make index 739cefe1c..84c8938a9 100644 --- a/rules/xorg-font-bh-ttf.make +++ b/rules/xorg-font-bh-ttf.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-bh-ttf.targetinstall: $(xorg-font-bh-ttf_targetinstall_dep xorg-font-bh-ttf_clean: rm -rf $(STATEDIR)/xorg-font-bh-ttf.* - rm -rf $(IMAGEDIR)/xorg-font-bh-ttf_* + rm -rf $(PKGDIR)/xorg-font-bh-ttf_* rm -rf $(XORG_FONT_BH_TTF_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make index 22e6a3142..3ad372c38 100644 --- a/rules/xorg-font-bitstream-100dpi.make +++ b/rules/xorg-font-bitstream-100dpi.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-bitstream-100dpi.targetinstall: $(xorg-font-bitstream-100d xorg-font-bitstream-100dpi_clean: rm -rf $(STATEDIR)/xorg-font-bitstream-100dpi.* - rm -rf $(IMAGEDIR)/xorg-font-bitstream-100dpi_* + rm -rf $(PKGDIR)/xorg-font-bitstream-100dpi_* rm -rf $(XORG_FONT_BITSTREAM_100DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make index 820eef297..560784175 100644 --- a/rules/xorg-font-bitstream-75dpi.make +++ b/rules/xorg-font-bitstream-75dpi.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-font-bitstream-75dpi.targetinstall: $(xorg-font-bitstream-75dpi xorg-font-bitstream-75dpi_clean: rm -rf $(STATEDIR)/xorg-font-bitstream-75dpi.* - rm -rf $(IMAGEDIR)/xorg-font-bitstream-75dpi_* + rm -rf $(PKGDIR)/xorg-font-bitstream-75dpi_* rm -rf $(XORG_FONT_BITSTREAM_75DPI_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make index 4e77d81d5..1015ca3fb 100644 --- a/rules/xorg-font-bitstream-speedo.make +++ b/rules/xorg-font-bitstream-speedo.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-font-bitstream-speedo.targetinstall: $(xorg-font-bitstream-spee xorg-font-bitstream-speedo_clean: rm -rf $(STATEDIR)/xorg-font-bitstream-speedo.* - rm -rf $(IMAGEDIR)/xorg-font-bitstream-speedo_* + rm -rf $(PKGDIR)/xorg-font-bitstream-speedo_* rm -rf $(XORG_FONT_BITSTREAM_SPEEDO_DIR) # vim: syntax=make diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make index 4cefb1851..b37c18676 100644 --- a/rules/xorg-font-bitstream-type1.make +++ b/rules/xorg-font-bitstream-type1.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-font-bitstream-type1.targetinstall: $(xorg-font-bitstream-type1 xorg-font-bitstream-type1_clean: rm -rf $(STATEDIR)/xorg-font-bitstream-type1.* - rm -rf $(IMAGEDIR)/xorg-font-bitstream-type1_* + rm -rf $(PKGDIR)/xorg-font-bitstream-type1_* rm -rf $(XORG_FONT_BITSTREAM_TYPE1_DIR) # vim: syntax=make diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make index cd016e25c..d1e945a32 100644 --- a/rules/xorg-font-cronyx-cyrillic.make +++ b/rules/xorg-font-cronyx-cyrillic.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-cronyx-cyrillic.targetinstall: $(xorg-font-cronyx-cyrillic xorg-font-cronyx-cyrillic_clean: rm -rf $(STATEDIR)/xorg-font-cronyx-cyrillic.* - rm -rf $(IMAGEDIR)/xorg-font-cronyx-cyrillic_* + rm -rf $(PKGDIR)/xorg-font-cronyx-cyrillic_* rm -rf $(XORG_FONT_CRONYX_CYRILLIC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make index e5d4bd800..cb863bc66 100644 --- a/rules/xorg-font-cursor-misc.make +++ b/rules/xorg-font-cursor-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-cursor-misc.targetinstall: $(xorg-font-cursor-misc_targeti xorg-font-cursor-misc_clean: rm -rf $(STATEDIR)/xorg-font-cursor-misc.* - rm -rf $(IMAGEDIR)/xorg-font-cursor-misc_* + rm -rf $(PKGDIR)/xorg-font-cursor-misc_* rm -rf $(XORG_FONT_CURSOR_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make index ce1750874..116ded4a3 100644 --- a/rules/xorg-font-daewoo-misc.make +++ b/rules/xorg-font-daewoo-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-daewoo-misc.targetinstall: $(xorg-font-daewoo-misc_targeti xorg-font-daewoo-misc_clean: rm -rf $(STATEDIR)/xorg-font-daewoo-misc.* - rm -rf $(IMAGEDIR)/xorg-font-daewoo-misc_* + rm -rf $(PKGDIR)/xorg-font-daewoo-misc_* rm -rf $(XORG_FONT_DAEWOO_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make index 2b86b6077..5d1ebe38d 100644 --- a/rules/xorg-font-dec-misc.make +++ b/rules/xorg-font-dec-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-dec-misc.targetinstall: $(xorg-font-dec-misc_targetinstall xorg-font-dec-misc_clean: rm -rf $(STATEDIR)/xorg-font-dec-misc.* - rm -rf $(IMAGEDIR)/xorg-font-dec-misc_* + rm -rf $(PKGDIR)/xorg-font-dec-misc_* rm -rf $(XORG_FONT_DEC_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make index 91a283959..cb67938eb 100644 --- a/rules/xorg-font-encodings.make +++ b/rules/xorg-font-encodings.make @@ -130,7 +130,7 @@ $(STATEDIR)/xorg-font-encodings.targetinstall: $(xorg-font-encodings_targetinsta xorg-font-encodings_clean: rm -rf $(STATEDIR)/xorg-font-encodings.* - rm -rf $(IMAGEDIR)/xorg-font-encodings_* + rm -rf $(PKGDIR)/xorg-font-encodings_* rm -rf $(XORG_FONT_ENCODINGS_DIR) # vim: syntax=make diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make index 8303af360..d2f48984b 100644 --- a/rules/xorg-font-ibm-type1.make +++ b/rules/xorg-font-ibm-type1.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-font-ibm-type1.targetinstall: $(xorg-font-ibm-type1_targetinsta xorg-font-ibm-type1_clean: rm -rf $(STATEDIR)/xorg-font-ibm-type1.* - rm -rf $(IMAGEDIR)/xorg-font-ibm-type1_* + rm -rf $(PKGDIR)/xorg-font-ibm-type1_* rm -rf $(XORG_FONT_IBM_TYPE1_DIR) # vim: syntax=make diff --git a/rules/xorg-font-intl.make b/rules/xorg-font-intl.make index c3b7c028d..94d111269 100644 --- a/rules/xorg-font-intl.make +++ b/rules/xorg-font-intl.make @@ -157,7 +157,7 @@ $(STATEDIR)/xorg-font-intl.targetinstall: $(xorg-font-intl_targetinstall_deps_de xorg-font-intl_clean: rm -rf $(STATEDIR)/xorg-font-intl.* - rm -rf $(IMAGEDIR)/xorg-font-intl_* + rm -rf $(PKGDIR)/xorg-font-intl_* rm -rf $(XORG_FONT_INTL_DIR) # vim: syntax=make diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make index e300cf7b1..96e98ae66 100644 --- a/rules/xorg-font-isas-misc.make +++ b/rules/xorg-font-isas-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-isas-misc.targetinstall: $(xorg-font-isas-misc_targetinsta xorg-font-isas-misc_clean: rm -rf $(STATEDIR)/xorg-font-isas-misc.* - rm -rf $(IMAGEDIR)/xorg-font-isas-misc_* + rm -rf $(PKGDIR)/xorg-font-isas-misc_* rm -rf $(XORG_FONT_ISAS_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make index 54894c317..bdd0ca028 100644 --- a/rules/xorg-font-jis-misc.make +++ b/rules/xorg-font-jis-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-jis-misc.targetinstall: $(xorg-font-jis-misc_targetinstall xorg-font-jis-misc_clean: rm -rf $(STATEDIR)/xorg-font-jis-misc.* - rm -rf $(IMAGEDIR)/xorg-font-jis-misc_* + rm -rf $(PKGDIR)/xorg-font-jis-misc_* rm -rf $(XORG_FONT_JIS_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make index 5b057cccd..39f99c64b 100644 --- a/rules/xorg-font-micro-misc.make +++ b/rules/xorg-font-micro-misc.make @@ -124,7 +124,7 @@ $(STATEDIR)/xorg-font-micro-misc.targetinstall: $(xorg-font-micro-misc_targetins xorg-font-micro-misc_clean: rm -rf $(STATEDIR)/xorg-font-micro-misc.* - rm -rf $(IMAGEDIR)/xorg-font-micro-misc_* + rm -rf $(PKGDIR)/xorg-font-micro-misc_* rm -rf $(XORG_FONT_MICRO_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make index f5be29381..2c7cfb9b9 100644 --- a/rules/xorg-font-misc-cyrillic.make +++ b/rules/xorg-font-misc-cyrillic.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-misc-cyrillic.targetinstall: $(xorg-font-misc-cyrillic_tar xorg-font-misc-cyrillic_clean: rm -rf $(STATEDIR)/xorg-font-misc-cyrillic.* - rm -rf $(IMAGEDIR)/xorg-font-misc-cyrillic_* + rm -rf $(PKGDIR)/xorg-font-misc-cyrillic_* rm -rf $(XORG_FONT_MISC_CYRILLIC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make index 78cde247b..638b975b8 100644 --- a/rules/xorg-font-misc-ethiopic.make +++ b/rules/xorg-font-misc-ethiopic.make @@ -135,7 +135,7 @@ $(STATEDIR)/xorg-font-misc-ethiopic.targetinstall: $(xorg-font-misc-ethiopic_tar xorg-font-misc-ethiopic_clean: rm -rf $(STATEDIR)/xorg-font-misc-ethiopic.* - rm -rf $(IMAGEDIR)/xorg-font-misc-ethiopic_* + rm -rf $(PKGDIR)/xorg-font-misc-ethiopic_* rm -rf $(XORG_FONT_MISC_ETHIOPIC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make index 30349046b..86d240c7e 100644 --- a/rules/xorg-font-misc-meltho.make +++ b/rules/xorg-font-misc-meltho.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-misc-meltho.targetinstall: $(xorg-font-misc-meltho_targeti xorg-font-misc-meltho_clean: rm -rf $(STATEDIR)/xorg-font-misc-meltho.* - rm -rf $(IMAGEDIR)/xorg-font-misc-meltho_* + rm -rf $(PKGDIR)/xorg-font-misc-meltho_* rm -rf $(XORG_FONT_MISC_MELTHO_DIR) # vim: syntax=make diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make index f6ae9f684..2ec80b849 100644 --- a/rules/xorg-font-misc-misc.make +++ b/rules/xorg-font-misc-misc.make @@ -150,7 +150,7 @@ endif xorg-font-misc-misc_clean: rm -rf $(STATEDIR)/xorg-font-misc-misc.* - rm -rf $(IMAGEDIR)/xorg-font-misc-misc_* + rm -rf $(PKGDIR)/xorg-font-misc-misc_* rm -rf $(XORG_FONT_MISC_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make index b459e1275..530112a25 100644 --- a/rules/xorg-font-mutt-misc.make +++ b/rules/xorg-font-mutt-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-mutt-misc.targetinstall: $(xorg-font-mutt-misc_targetinsta xorg-font-mutt-misc_clean: rm -rf $(STATEDIR)/xorg-font-mutt-misc.* - rm -rf $(IMAGEDIR)/xorg-font-mutt-misc_* + rm -rf $(PKGDIR)/xorg-font-mutt-misc_* rm -rf $(XORG_FONT_MUTT_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make index 021a90632..e22654a44 100644 --- a/rules/xorg-font-schumacher-misc.make +++ b/rules/xorg-font-schumacher-misc.make @@ -148,7 +148,7 @@ endif xorg-font-schumacher-misc_clean: rm -rf $(STATEDIR)/xorg-font-schumacher-misc.* - rm -rf $(IMAGEDIR)/xorg-font-schumacher-misc_* + rm -rf $(PKGDIR)/xorg-font-schumacher-misc_* rm -rf $(XORG_FONT_SCHUMACHER_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make index 8dc349674..8a1432cc9 100644 --- a/rules/xorg-font-screen-cyrillic.make +++ b/rules/xorg-font-screen-cyrillic.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-screen-cyrillic.targetinstall: $(xorg-font-screen-cyrillic xorg-font-screen-cyrillic_clean: rm -rf $(STATEDIR)/xorg-font-screen-cyrillic.* - rm -rf $(IMAGEDIR)/xorg-font-screen-cyrillic_* + rm -rf $(PKGDIR)/xorg-font-screen-cyrillic_* rm -rf $(XORG_FONT_SCREEN_CYRILLIC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make index e7d496e7d..85330922d 100644 --- a/rules/xorg-font-sony-misc.make +++ b/rules/xorg-font-sony-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-sony-misc.targetinstall: $(xorg-font-sony-misc_targetinsta xorg-font-sony-misc_clean: rm -rf $(STATEDIR)/xorg-font-sony-misc.* - rm -rf $(IMAGEDIR)/xorg-font-sony-misc_* + rm -rf $(PKGDIR)/xorg-font-sony-misc_* rm -rf $(XORG_FONT_SONY_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make index bb7f5a2a3..55c0ca505 100644 --- a/rules/xorg-font-sun-misc.make +++ b/rules/xorg-font-sun-misc.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-sun-misc.targetinstall: $(xorg-font-sun-misc_targetinstall xorg-font-sun-misc_clean: rm -rf $(STATEDIR)/xorg-font-sun-misc.* - rm -rf $(IMAGEDIR)/xorg-font-sun-misc_* + rm -rf $(PKGDIR)/xorg-font-sun-misc_* rm -rf $(XORG_FONT_SUN_MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-ttf-bitstream-vera.make b/rules/xorg-font-ttf-bitstream-vera.make index 9d280f030..bb3e46d7c 100644 --- a/rules/xorg-font-ttf-bitstream-vera.make +++ b/rules/xorg-font-ttf-bitstream-vera.make @@ -111,7 +111,7 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall: $(xorg-font-ttf-bitstrea xorg-font-ttf-bitstream-vera_clean: rm -rf $(STATEDIR)/xorg-font-ttf-bitstream-vera.* - rm -rf $(IMAGEDIR)/xorg-font-ttf-bitstream-vera_* + rm -rf $(PKGDIR)/xorg-font-ttf-bitstream-vera_* rm -rf $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) # vim: syntax=make diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make index bee5ba305..4b11b1267 100644 --- a/rules/xorg-font-util.make +++ b/rules/xorg-font-util.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-font-util.targetinstall: $(xorg-font-util_targetinstall_deps_de xorg-font-util_clean: rm -rf $(STATEDIR)/xorg-font-util.* - rm -rf $(IMAGEDIR)/xorg-font-util_* + rm -rf $(PKGDIR)/xorg-font-util_* rm -rf $(XORG_FONT_UTIL_DIR) # vim: syntax=make diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make index 598c0d8b6..8de930c37 100644 --- a/rules/xorg-font-winitzki-cyrillic.make +++ b/rules/xorg-font-winitzki-cyrillic.make @@ -127,7 +127,7 @@ $(STATEDIR)/xorg-font-winitzki-cyrillic.targetinstall: $(xorg-font-winitzki-cyri xorg-font-winitzki-cyrillic_clean: rm -rf $(STATEDIR)/xorg-font-winitzki-cyrillic.* - rm -rf $(IMAGEDIR)/xorg-font-winitzki-cyrillic_* + rm -rf $(PKGDIR)/xorg-font-winitzki-cyrillic_* rm -rf $(XORG_FONT_WINITZKI_CYRILLIC_DIR) # vim: syntax=make diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make index 3f8ad71a8..ea8bb00c3 100644 --- a/rules/xorg-font-xfree86-type1.make +++ b/rules/xorg-font-xfree86-type1.make @@ -126,7 +126,7 @@ $(STATEDIR)/xorg-font-xfree86-type1.targetinstall: $(xorg-font-xfree86-type1_tar xorg-font-xfree86-type1_clean: rm -rf $(STATEDIR)/xorg-font-xfree86-type1.* - rm -rf $(IMAGEDIR)/xorg-font-xfree86-type1_* + rm -rf $(PKGDIR)/xorg-font-xfree86-type1_* rm -rf $(XORG_FONT_XFREE86_TYPE1_DIR) # vim: syntax=make diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 1057d3f76..8993d4366 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -141,7 +141,7 @@ $(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-fonts.install xorg-fonts_clean: rm -rf $(STATEDIR)/xorg-fonts.* - rm -rf $(IMAGEDIR)/xorg-fonts_* + rm -rf $(PKGDIR)/xorg-fonts_* rm -rf $(XORG_FONTS_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-AppleWM.make b/rules/xorg-lib-AppleWM.make index 5dc241d44..c2a538c86 100644 --- a/rules/xorg-lib-AppleWM.make +++ b/rules/xorg-lib-AppleWM.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-AppleWM.targetinstall: $(xorg-lib-AppleWM_targetinstall_dep xorg-lib-AppleWM_clean: rm -rf $(STATEDIR)/xorg-lib-AppleWM.* - rm -rf $(IMAGEDIR)/xorg-lib-AppleWM_* + rm -rf $(PKGDIR)/xorg-lib-AppleWM_* rm -rf $(XORG_LIB_APPLEWM_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make index 381ba67b3..7be4bc5dc 100644 --- a/rules/xorg-lib-FS.make +++ b/rules/xorg-lib-FS.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-FS.targetinstall: $(xorg-lib-FS_targetinstall_deps_default) xorg-lib-FS_clean: rm -rf $(STATEDIR)/xorg-lib-FS.* - rm -rf $(IMAGEDIR)/xorg-lib-FS_* + rm -rf $(PKGDIR)/xorg-lib-FS_* rm -rf $(XORG_LIB_FS_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make index 9bab765a8..dfa28b309 100644 --- a/rules/xorg-lib-ICE.make +++ b/rules/xorg-lib-ICE.make @@ -139,7 +139,7 @@ $(STATEDIR)/xorg-lib-ICE.targetinstall: $(xorg-lib-ICE_targetinstall_deps_defaul xorg-lib-ICE_clean: rm -rf $(STATEDIR)/xorg-lib-ICE.* - rm -rf $(IMAGEDIR)/xorg-lib-ICE_* + rm -rf $(PKGDIR)/xorg-lib-ICE_* rm -rf $(XORG_LIB_ICE_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make index dbc2de587..2f17918d0 100644 --- a/rules/xorg-lib-SM.make +++ b/rules/xorg-lib-SM.make @@ -139,7 +139,7 @@ $(STATEDIR)/xorg-lib-SM.targetinstall: $(xorg-lib-SM_targetinstall_deps_default) xorg-lib-SM_clean: rm -rf $(STATEDIR)/xorg-lib-SM.* - rm -rf $(IMAGEDIR)/xorg-lib-SM_* + rm -rf $(PKGDIR)/xorg-lib-SM_* rm -rf $(XORG_LIB_SM_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make index c0d23b2a3..85c6f3e1d 100644 --- a/rules/xorg-lib-WindowsWM.make +++ b/rules/xorg-lib-WindowsWM.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-WindowsWM.targetinstall: $(xorg-lib-WindowsWM_targetinstall xorg-lib-WindowsWM_clean: rm -rf $(STATEDIR)/xorg-lib-WindowsWM.* - rm -rf $(IMAGEDIR)/xorg-lib-WindowsWM_* + rm -rf $(PKGDIR)/xorg-lib-WindowsWM_* rm -rf $(XORG_LIB_WINDOWSWM_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make index 2f319f1b7..05fc7db49 100644 --- a/rules/xorg-lib-X11.make +++ b/rules/xorg-lib-X11.make @@ -301,7 +301,7 @@ endif xorg-lib-X11_clean: rm -rf $(STATEDIR)/xorg-lib-X11.* - rm -rf $(IMAGEDIR)/xorg-lib-X11_* + rm -rf $(PKGDIR)/xorg-lib-X11_* rm -rf $(XORG_LIB_X11_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-XScrnSaver.make b/rules/xorg-lib-XScrnSaver.make index b7180f447..6632db118 100644 --- a/rules/xorg-lib-XScrnSaver.make +++ b/rules/xorg-lib-XScrnSaver.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-XScrnSaver.targetinstall: $(xorg-lib-XScrnSaver_targetinsta xorg-lib-XScrnSaver_clean: rm -rf $(STATEDIR)/xorg-lib-XScrnSaver.* - rm -rf $(IMAGEDIR)/xorg-lib-XScrnSaver_* + rm -rf $(PKGDIR)/xorg-lib-XScrnSaver_* rm -rf $(XORG_LIB_XSCRNSAVER_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-XTrap.make b/rules/xorg-lib-XTrap.make index 9d704be2d..d6845f188 100644 --- a/rules/xorg-lib-XTrap.make +++ b/rules/xorg-lib-XTrap.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-XTrap.targetinstall: $(xorg-lib-XTrap_targetinstall_deps_de xorg-lib-XTrap_clean: rm -rf $(STATEDIR)/xorg-lib-XTrap.* - rm -rf $(IMAGEDIR)/xorg-lib-XTrap_* + rm -rf $(PKGDIR)/xorg-lib-XTrap_* rm -rf $(XORG_LIB_XTRAP_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make index b1427d553..e4513ac60 100644 --- a/rules/xorg-lib-Xau.make +++ b/rules/xorg-lib-Xau.make @@ -143,7 +143,7 @@ $(STATEDIR)/xorg-lib-Xau.targetinstall: $(xorg-lib-Xau_targetinstall_deps_defaul xorg-lib-Xau_clean: rm -rf $(STATEDIR)/xorg-lib-Xau.* - rm -rf $(IMAGEDIR)/xorg-lib-Xau_* + rm -rf $(PKGDIR)/xorg-lib-Xau_* rm -rf $(XORG_LIB_XAU_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make index 22ac17d57..aa7d0e1db 100644 --- a/rules/xorg-lib-Xaw.make +++ b/rules/xorg-lib-Xaw.make @@ -196,7 +196,7 @@ endif xorg-lib-Xaw_clean: rm -rf $(STATEDIR)/xorg-lib-Xaw.* - rm -rf $(IMAGEDIR)/xorg-lib-Xaw_* + rm -rf $(PKGDIR)/xorg-lib-Xaw_* rm -rf $(XORG_LIB_XAW_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make index d5e430aa8..2715adb27 100644 --- a/rules/xorg-lib-Xcomposite.make +++ b/rules/xorg-lib-Xcomposite.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-Xcomposite.targetinstall: $(xorg-lib-Xcomposite_targetinsta xorg-lib-Xcomposite_clean: rm -rf $(STATEDIR)/xorg-lib-Xcomposite.* - rm -rf $(IMAGEDIR)/xorg-lib-Xcomposite_* + rm -rf $(PKGDIR)/xorg-lib-Xcomposite_* rm -rf $(XORG_LIB_XCOMPOSITE_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xcursor.make b/rules/xorg-lib-Xcursor.make index f9ad3341f..b7772a59d 100644 --- a/rules/xorg-lib-Xcursor.make +++ b/rules/xorg-lib-Xcursor.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-Xcursor.targetinstall: $(xorg-lib-Xcursor_targetinstall_dep xorg-lib-Xcursor_clean: rm -rf $(STATEDIR)/xorg-lib-Xcursor.* - rm -rf $(IMAGEDIR)/xorg-lib-Xcursor_* + rm -rf $(PKGDIR)/xorg-lib-Xcursor_* rm -rf $(XORG_LIB_XCURSOR_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make index 8fcc27f0f..6f9ca0448 100644 --- a/rules/xorg-lib-Xdamage.make +++ b/rules/xorg-lib-Xdamage.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-Xdamage.targetinstall: $(xorg-lib-Xdamage_targetinstall_dep xorg-lib-Xdamage_clean: rm -rf $(STATEDIR)/xorg-lib-Xdamage.* - rm -rf $(IMAGEDIR)/xorg-lib-Xdamage_* + rm -rf $(PKGDIR)/xorg-lib-Xdamage_* rm -rf $(XORG_LIB_XDAMAGE_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make index f89bcf177..37619f984 100644 --- a/rules/xorg-lib-Xdmcp.make +++ b/rules/xorg-lib-Xdmcp.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xdmcp.targetinstall: $(xorg-lib-Xdmcp_targetinstall_deps_de xorg-lib-Xdmcp_clean: rm -rf $(STATEDIR)/xorg-lib-Xdmcp.* - rm -rf $(IMAGEDIR)/xorg-lib-Xdmcp_* + rm -rf $(PKGDIR)/xorg-lib-Xdmcp_* rm -rf $(XORG_LIB_XDMCP_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xevie.make b/rules/xorg-lib-Xevie.make index 33f25ac08..94881bc68 100644 --- a/rules/xorg-lib-Xevie.make +++ b/rules/xorg-lib-Xevie.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xevie.targetinstall: $(xorg-lib-Xevie_targetinstall_deps_de xorg-lib-Xevie_clean: rm -rf $(STATEDIR)/xorg-lib-Xevie.* - rm -rf $(IMAGEDIR)/xorg-lib-Xevie_* + rm -rf $(PKGDIR)/xorg-lib-Xevie_* rm -rf $(XORG_LIB_XEVIE_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make index 48803c261..9ca98c3f5 100644 --- a/rules/xorg-lib-Xext.make +++ b/rules/xorg-lib-Xext.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xext.targetinstall: $(xorg-lib-Xext_targetinstall_deps_defa xorg-lib-Xext_clean: rm -rf $(STATEDIR)/xorg-lib-Xext.* - rm -rf $(IMAGEDIR)/xorg-lib-Xext_* + rm -rf $(PKGDIR)/xorg-lib-Xext_* rm -rf $(XORG_LIB_XEXT_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make index 4398da45e..c44b7fefb 100644 --- a/rules/xorg-lib-Xfixes.make +++ b/rules/xorg-lib-Xfixes.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-Xfixes.targetinstall: $(xorg-lib-Xfixes_targetinstall_deps_ xorg-lib-Xfixes_clean: rm -rf $(STATEDIR)/xorg-lib-Xfixes.* - rm -rf $(IMAGEDIR)/xorg-lib-Xfixes_* + rm -rf $(PKGDIR)/xorg-lib-Xfixes_* rm -rf $(XORG_LIB_XFIXES_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make index ed6dc73ba..b52dfc2e9 100644 --- a/rules/xorg-lib-Xfont.make +++ b/rules/xorg-lib-Xfont.make @@ -202,7 +202,7 @@ $(STATEDIR)/xorg-lib-xfont.targetinstall: $(xorg-lib-xfont_targetinstall_deps_de xorg-lib-xfont_clean: rm -rf $(STATEDIR)/xorg-lib-xfont.* - rm -rf $(IMAGEDIR)/xorg-lib-xfont_* + rm -rf $(PKGDIR)/xorg-lib-xfont_* rm -rf $(XORG_LIB_XFONT_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xfontcache.make b/rules/xorg-lib-Xfontcache.make index c30e196d9..4435ace37 100644 --- a/rules/xorg-lib-Xfontcache.make +++ b/rules/xorg-lib-Xfontcache.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xfontcache.targetinstall: $(xorg-lib-Xfontcache_targetinsta xorg-lib-Xfontcache_clean: rm -rf $(STATEDIR)/xorg-lib-Xfontcache.* - rm -rf $(IMAGEDIR)/xorg-lib-Xfontcache_* + rm -rf $(PKGDIR)/xorg-lib-Xfontcache_* rm -rf $(XORG_LIB_XFONTCACHE_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make index 146418e42..ec8f53f11 100644 --- a/rules/xorg-lib-Xft.make +++ b/rules/xorg-lib-Xft.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-Xft.targetinstall: $(xorg-lib-Xft_targetinstall_deps_defaul xorg-lib-Xft_clean: rm -rf $(STATEDIR)/xorg-lib-Xft.* - rm -rf $(IMAGEDIR)/xorg-lib-Xft_* + rm -rf $(PKGDIR)/xorg-lib-Xft_* rm -rf $(XORG_LIB_XFT_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make index c9836fe25..5c2821951 100644 --- a/rules/xorg-lib-Xi.make +++ b/rules/xorg-lib-Xi.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xi.targetinstall: $(xorg-lib-Xi_targetinstall_deps_default) xorg-lib-Xi_clean: rm -rf $(STATEDIR)/xorg-lib-Xi.* - rm -rf $(IMAGEDIR)/xorg-lib-Xi_* + rm -rf $(PKGDIR)/xorg-lib-Xi_* rm -rf $(XORG_LIB_XI_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xinerama.make b/rules/xorg-lib-Xinerama.make index b582f8565..a3bb3cea2 100644 --- a/rules/xorg-lib-Xinerama.make +++ b/rules/xorg-lib-Xinerama.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xinerama.targetinstall: $(xorg-lib-Xinerama_targetinstall_d xorg-lib-Xinerama_clean: rm -rf $(STATEDIR)/xorg-lib-Xinerama.* - rm -rf $(IMAGEDIR)/xorg-lib-Xinerama_* + rm -rf $(PKGDIR)/xorg-lib-Xinerama_* rm -rf $(XORG_LIB_XINERAMA_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make index 6d2b4f358..8ce7c1ee0 100644 --- a/rules/xorg-lib-Xmu.make +++ b/rules/xorg-lib-Xmu.make @@ -151,7 +151,7 @@ $(STATEDIR)/xorg-lib-Xmu.targetinstall: $(xorg-lib-Xmu_targetinstall_deps_defaul xorg-lib-Xmu_clean: rm -rf $(STATEDIR)/xorg-lib-Xmu.* - rm -rf $(IMAGEDIR)/xorg-lib-Xmu_* + rm -rf $(PKGDIR)/xorg-lib-Xmu_* rm -rf $(XORG_LIB_XMU_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xp.make b/rules/xorg-lib-Xp.make index 3cfc9ef43..ce9083c9c 100644 --- a/rules/xorg-lib-Xp.make +++ b/rules/xorg-lib-Xp.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xp.targetinstall: $(xorg-lib-Xp_targetinstall_deps_default) xorg-lib-Xp_clean: rm -rf $(STATEDIR)/xorg-lib-Xp.* - rm -rf $(IMAGEDIR)/xorg-lib-Xp_* + rm -rf $(PKGDIR)/xorg-lib-Xp_* rm -rf $(XORG_LIB_XP_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make index 56216e5d1..066505afb 100644 --- a/rules/xorg-lib-Xpm.make +++ b/rules/xorg-lib-Xpm.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xpm.targetinstall: $(xorg-lib-Xpm_targetinstall_deps_defaul xorg-lib-Xpm_clean: rm -rf $(STATEDIR)/xorg-lib-Xpm.* - rm -rf $(IMAGEDIR)/xorg-lib-Xpm_* + rm -rf $(PKGDIR)/xorg-lib-Xpm_* rm -rf $(XORG_LIB_XPM_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-XprintAppUtil.make b/rules/xorg-lib-XprintAppUtil.make index 129b4d853..511754f6c 100644 --- a/rules/xorg-lib-XprintAppUtil.make +++ b/rules/xorg-lib-XprintAppUtil.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-XprintAppUtil.targetinstall: $(xorg-lib-XprintAppUtil_targe xorg-lib-XprintAppUtil_clean: rm -rf $(STATEDIR)/xorg-lib-XprintAppUtil.* - rm -rf $(IMAGEDIR)/xorg-lib-XprintAppUtil_* + rm -rf $(PKGDIR)/xorg-lib-XprintAppUtil_* rm -rf $(XORG_LIB_XPRINTAPPUTIL_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-XprintUtil.make b/rules/xorg-lib-XprintUtil.make index e0f2bd93e..ee9dce7da 100644 --- a/rules/xorg-lib-XprintUtil.make +++ b/rules/xorg-lib-XprintUtil.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-XprintUtil.targetinstall: $(xorg-lib-XprintUtil_targetinsta xorg-lib-XprintUtil_clean: rm -rf $(STATEDIR)/xorg-lib-XprintUtil.* - rm -rf $(IMAGEDIR)/xorg-lib-XprintUtil_* + rm -rf $(PKGDIR)/xorg-lib-XprintUtil_* rm -rf $(XORG_LIB_XPRINTUTIL_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xrandr.make b/rules/xorg-lib-Xrandr.make index d9b7932df..66d8d7d4a 100644 --- a/rules/xorg-lib-Xrandr.make +++ b/rules/xorg-lib-Xrandr.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xrandr.targetinstall: $(xorg-lib-Xrandr_targetinstall_deps_ xorg-lib-Xrandr_clean: rm -rf $(STATEDIR)/xorg-lib-Xrandr.* - rm -rf $(IMAGEDIR)/xorg-lib-Xrandr_* + rm -rf $(PKGDIR)/xorg-lib-Xrandr_* rm -rf $(XORG_LIB_XRANDR_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make index 52116221a..5f14737dd 100644 --- a/rules/xorg-lib-Xrender.make +++ b/rules/xorg-lib-Xrender.make @@ -139,7 +139,7 @@ $(STATEDIR)/xorg-lib-Xrender.targetinstall: $(xorg-lib-Xrender_targetinstall_dep xorg-lib-Xrender_clean: rm -rf $(STATEDIR)/xorg-lib-Xrender.* - rm -rf $(IMAGEDIR)/xorg-lib-Xrender_* + rm -rf $(PKGDIR)/xorg-lib-Xrender_* rm -rf $(XORG_LIB_XRENDER_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make index 5cf08d9a8..46b1c12bf 100644 --- a/rules/xorg-lib-Xres.make +++ b/rules/xorg-lib-Xres.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xres.targetinstall: $(xorg-lib-Xres_targetinstall_deps_defa xorg-lib-Xres_clean: rm -rf $(STATEDIR)/xorg-lib-Xres.* - rm -rf $(IMAGEDIR)/xorg-lib-Xres_* + rm -rf $(PKGDIR)/xorg-lib-Xres_* rm -rf $(XORG_LIB_XRES_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make index e65683f20..995b9afb7 100644 --- a/rules/xorg-lib-Xt.make +++ b/rules/xorg-lib-Xt.make @@ -145,7 +145,7 @@ $(STATEDIR)/xorg-lib-Xt.targetinstall: $(xorg-lib-Xt_targetinstall_deps_default) xorg-lib-Xt_clean: rm -rf $(STATEDIR)/xorg-lib-Xt.* - rm -rf $(IMAGEDIR)/xorg-lib-Xt_* + rm -rf $(PKGDIR)/xorg-lib-Xt_* rm -rf $(XORG_LIB_XT_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xtst.make b/rules/xorg-lib-Xtst.make index a5be899f1..15593cf7f 100644 --- a/rules/xorg-lib-Xtst.make +++ b/rules/xorg-lib-Xtst.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-Xtst.targetinstall: $(xorg-lib-Xtst_targetinstall_deps_defa xorg-lib-Xtst_clean: rm -rf $(STATEDIR)/xorg-lib-Xtst.* - rm -rf $(IMAGEDIR)/xorg-lib-Xtst_* + rm -rf $(PKGDIR)/xorg-lib-Xtst_* rm -rf $(XORG_LIB_XTST_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xv.make b/rules/xorg-lib-Xv.make index c0d6407fa..baf3f5a9e 100644 --- a/rules/xorg-lib-Xv.make +++ b/rules/xorg-lib-Xv.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xv.targetinstall: $(xorg-lib-Xv_targetinstall_deps_default) xorg-lib-Xv_clean: rm -rf $(STATEDIR)/xorg-lib-Xv.* - rm -rf $(IMAGEDIR)/xorg-lib-Xv_* + rm -rf $(PKGDIR)/xorg-lib-Xv_* rm -rf $(XORG_LIB_XV_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-XvMC.make b/rules/xorg-lib-XvMC.make index 0f22fc7d5..8dc3cf6b2 100644 --- a/rules/xorg-lib-XvMC.make +++ b/rules/xorg-lib-XvMC.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-lib-XvMC.targetinstall: $(xorg-lib-XvMC_targetinstall_deps_defa xorg-lib-XvMC_clean: rm -rf $(STATEDIR)/xorg-lib-XvMC.* - rm -rf $(IMAGEDIR)/xorg-lib-XvMC_* + rm -rf $(PKGDIR)/xorg-lib-XvMC_* rm -rf $(XORG_LIB_XVMC_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xxf86dga.make b/rules/xorg-lib-Xxf86dga.make index 2d5c11a11..a512620cd 100644 --- a/rules/xorg-lib-Xxf86dga.make +++ b/rules/xorg-lib-Xxf86dga.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xxf86dga.targetinstall: $(xorg-lib-Xxf86dga_targetinstall_d xorg-lib-Xxf86dga_clean: rm -rf $(STATEDIR)/xorg-lib-Xxf86dga.* - rm -rf $(IMAGEDIR)/xorg-lib-Xxf86dga_* + rm -rf $(PKGDIR)/xorg-lib-Xxf86dga_* rm -rf $(XORG_LIB_XXF86DGA_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make index b0a276fdd..316396c10 100644 --- a/rules/xorg-lib-Xxf86misc.make +++ b/rules/xorg-lib-Xxf86misc.make @@ -138,7 +138,7 @@ $(STATEDIR)/xorg-lib-Xxf86misc.targetinstall: $(xorg-lib-Xxf86misc_targetinstall xorg-lib-Xxf86misc_clean: rm -rf $(STATEDIR)/xorg-lib-Xxf86misc.* - rm -rf $(IMAGEDIR)/xorg-lib-Xxf86misc_* + rm -rf $(PKGDIR)/xorg-lib-Xxf86misc_* rm -rf $(XORG_LIB_XXF86MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-Xxf86vm.make b/rules/xorg-lib-Xxf86vm.make index 555d17cec..01e0fbf1a 100644 --- a/rules/xorg-lib-Xxf86vm.make +++ b/rules/xorg-lib-Xxf86vm.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-Xxf86vm.targetinstall: $(xorg-lib-Xxf86vm_targetinstall_dep xorg-lib-Xxf86vm_clean: rm -rf $(STATEDIR)/xorg-lib-Xxf86vm.* - rm -rf $(IMAGEDIR)/xorg-lib-Xxf86vm_* + rm -rf $(PKGDIR)/xorg-lib-Xxf86vm_* rm -rf $(XORG_LIB_XXF86VM_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make index 80b95a50b..3d5533c96 100644 --- a/rules/xorg-lib-dmx.make +++ b/rules/xorg-lib-dmx.make @@ -128,7 +128,7 @@ $(STATEDIR)/xorg-lib-dmx.targetinstall: $(xorg-lib-dmx_targetinstall_deps_defaul xorg-lib-dmx_clean: rm -rf $(STATEDIR)/xorg-lib-dmx.* - rm -rf $(IMAGEDIR)/xorg-lib-dmx_* + rm -rf $(PKGDIR)/xorg-lib-dmx_* rm -rf $(XORG_LIB_DMX_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make index 475564f46..b5f402b3f 100644 --- a/rules/xorg-lib-fontenc.make +++ b/rules/xorg-lib-fontenc.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-fontenc.targetinstall: $(xorg-lib-fontenc_targetinstall_dep xorg-lib-fontenc_clean: rm -rf $(STATEDIR)/xorg-lib-fontenc.* - rm -rf $(IMAGEDIR)/xorg-lib-fontenc_* + rm -rf $(PKGDIR)/xorg-lib-fontenc_* rm -rf $(XORG_LIB_FONTENC_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-lbxutil.make b/rules/xorg-lib-lbxutil.make index 8acb0674b..f06a0d13b 100644 --- a/rules/xorg-lib-lbxutil.make +++ b/rules/xorg-lib-lbxutil.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-lbxutil.targetinstall: $(xorg-lib-lbxutil_targetinstall_dep xorg-lib-lbxutil_clean: rm -rf $(STATEDIR)/xorg-lib-lbxutil.* - rm -rf $(IMAGEDIR)/xorg-lib-lbxutil_* + rm -rf $(PKGDIR)/xorg-lib-lbxutil_* rm -rf $(XORG_LIB_LBXUTIL_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make index 2751be465..760652d2a 100644 --- a/rules/xorg-lib-oldX.make +++ b/rules/xorg-lib-oldX.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-oldX.targetinstall: $(xorg-lib-oldX_targetinstall_deps_defa xorg-lib-oldX_clean: rm -rf $(STATEDIR)/xorg-lib-oldX.* - rm -rf $(IMAGEDIR)/xorg-lib-oldX_* + rm -rf $(PKGDIR)/xorg-lib-oldX_* rm -rf $(XORG_LIB_OLDX_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make index 8a171e870..0d69c4471 100644 --- a/rules/xorg-lib-xkbfile.make +++ b/rules/xorg-lib-xkbfile.make @@ -137,7 +137,7 @@ $(STATEDIR)/xorg-lib-xkbfile.targetinstall: $(xorg-lib-xkbfile_targetinstall_dep xorg-lib-xkbfile_clean: rm -rf $(STATEDIR)/xorg-lib-xkbfile.* - rm -rf $(IMAGEDIR)/xorg-lib-xkbfile_* + rm -rf $(PKGDIR)/xorg-lib-xkbfile_* rm -rf $(XORG_LIB_XKBFILE_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make index 52054376e..db8e779db 100644 --- a/rules/xorg-lib-xkbui.make +++ b/rules/xorg-lib-xkbui.make @@ -136,7 +136,7 @@ $(STATEDIR)/xorg-lib-xkbui.targetinstall: $(xorg-lib-xkbui_targetinstall_deps_de xorg-lib-xkbui_clean: rm -rf $(STATEDIR)/xorg-lib-xkbui.* - rm -rf $(IMAGEDIR)/xorg-lib-xkbui_* + rm -rf $(PKGDIR)/xorg-lib-xkbui_* rm -rf $(XORG_LIB_XKBUI_DIR) # vim: syntax=make diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make index 4f65dcce8..a3827c7c2 100644 --- a/rules/xorg-lib-xtrans.make +++ b/rules/xorg-lib-xtrans.make @@ -113,7 +113,7 @@ $(STATEDIR)/xorg-lib-xtrans.targetinstall: $(xorg-lib-xtrans_targetinstall_deps_ xorg-lib-xtrans_clean: rm -rf $(STATEDIR)/xorg-lib-xtrans.* - rm -rf $(IMAGEDIR)/xorg-lib-xtrans_* + rm -rf $(PKGDIR)/xorg-lib-xtrans_* rm -rf $(XORG_LIB_XTRANS_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-applewm.make b/rules/xorg-proto-applewm.make index d65e205d5..3827b1bc5 100644 --- a/rules/xorg-proto-applewm.make +++ b/rules/xorg-proto-applewm.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-applewm.targetinstall: $(xorg-proto-applewm_targetinstall xorg-proto-applewm_clean: rm -rf $(STATEDIR)/xorg-proto-applewm.* - rm -rf $(IMAGEDIR)/xorg-proto-applewm_* + rm -rf $(PKGDIR)/xorg-proto-applewm_* rm -rf $(XORG_PROTO_APPLEWM_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make index a85c6a7b5..57f6111a5 100644 --- a/rules/xorg-proto-bigreqs.make +++ b/rules/xorg-proto-bigreqs.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-bigreqs.targetinstall: $(xorg-proto-bigreqs_targetinstall xorg-proto-bigreqs_clean: rm -rf $(STATEDIR)/xorg-proto-bigreqs.* - rm -rf $(IMAGEDIR)/xorg-proto-bigreqs_* + rm -rf $(PKGDIR)/xorg-proto-bigreqs_* rm -rf $(XORG_PROTO_BIGREQS_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make index 77a6fdc95..407eba4b3 100644 --- a/rules/xorg-proto-composite.make +++ b/rules/xorg-proto-composite.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-composite.targetinstall: $(xorg-proto-composite_targetins xorg-proto-composite_clean: rm -rf $(STATEDIR)/xorg-proto-composite.* - rm -rf $(IMAGEDIR)/xorg-proto-composite_* + rm -rf $(PKGDIR)/xorg-proto-composite_* rm -rf $(XORG_PROTO_COMPOSITE_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make index f87238455..81f415c47 100644 --- a/rules/xorg-proto-damage.make +++ b/rules/xorg-proto-damage.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-damage.targetinstall: $(xorg-proto-damage_targetinstall_d xorg-proto-damage_clean: rm -rf $(STATEDIR)/xorg-proto-damage.* - rm -rf $(IMAGEDIR)/xorg-proto-damage_* + rm -rf $(PKGDIR)/xorg-proto-damage_* rm -rf $(XORG_PROTO_DAMAGE_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make index ed6609d73..d9719520f 100644 --- a/rules/xorg-proto-dmx.make +++ b/rules/xorg-proto-dmx.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-dmx.targetinstall: $(xorg-proto-dmx_targetinstall_deps_de xorg-proto-dmx_clean: rm -rf $(STATEDIR)/xorg-proto-dmx.* - rm -rf $(IMAGEDIR)/xorg-proto-dmx_* + rm -rf $(PKGDIR)/xorg-proto-dmx_* rm -rf $(XORG_PROTO_DMX_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make index 95ed3ed52..03a4ecd36 100644 --- a/rules/xorg-proto-evieext.make +++ b/rules/xorg-proto-evieext.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-evieext.targetinstall: $(xorg-proto-evieext_targetinstall xorg-proto-evieext_clean: rm -rf $(STATEDIR)/xorg-proto-evieext.* - rm -rf $(IMAGEDIR)/xorg-proto-evieext_* + rm -rf $(PKGDIR)/xorg-proto-evieext_* rm -rf $(XORG_PROTO_EVIEEXT_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make index 62fd54dda..d7cf2d027 100644 --- a/rules/xorg-proto-fixes.make +++ b/rules/xorg-proto-fixes.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-fixes.targetinstall: $(xorg-proto-fixes_targetinstall_dep xorg-proto-fixes_clean: rm -rf $(STATEDIR)/xorg-proto-fixes.* - rm -rf $(IMAGEDIR)/xorg-proto-fixes_* + rm -rf $(PKGDIR)/xorg-proto-fixes_* rm -rf $(XORG_PROTO_FIXES_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-fontcache.make b/rules/xorg-proto-fontcache.make index 3b2885362..c40d2c5a4 100644 --- a/rules/xorg-proto-fontcache.make +++ b/rules/xorg-proto-fontcache.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-fontcache.targetinstall: $(xorg-proto-fontcache_targetins xorg-proto-fontcache_clean: rm -rf $(STATEDIR)/xorg-proto-fontcache.* - rm -rf $(IMAGEDIR)/xorg-proto-fontcache_* + rm -rf $(PKGDIR)/xorg-proto-fontcache_* rm -rf $(XORG_PROTO_FONTCACHE_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make index a7727618c..c32fba1a5 100644 --- a/rules/xorg-proto-fonts.make +++ b/rules/xorg-proto-fonts.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-fonts.targetinstall: $(xorg-proto-fonts_targetinstall_dep xorg-proto-fonts_clean: rm -rf $(STATEDIR)/xorg-proto-fonts.* - rm -rf $(IMAGEDIR)/xorg-proto-fonts_* + rm -rf $(PKGDIR)/xorg-proto-fonts_* rm -rf $(XORG_PROTO_FONTS_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make index 72f3f11eb..85c75922a 100644 --- a/rules/xorg-proto-gl.make +++ b/rules/xorg-proto-gl.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-gl.targetinstall: $(xorg-proto-gl_targetinstall_deps_defa xorg-proto-gl_clean: rm -rf $(STATEDIR)/xorg-proto-gl.* - rm -rf $(IMAGEDIR)/xorg-proto-gl_* + rm -rf $(PKGDIR)/xorg-proto-gl_* rm -rf $(XORG_PROTO_GL_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make index 8dddbd052..91fa45550 100644 --- a/rules/xorg-proto-input.make +++ b/rules/xorg-proto-input.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-input.targetinstall: $(xorg-proto-input_targetinstall_dep xorg-proto-input_clean: rm -rf $(STATEDIR)/xorg-proto-input.* - rm -rf $(IMAGEDIR)/xorg-proto-input_* + rm -rf $(PKGDIR)/xorg-proto-input_* rm -rf $(XORG_PROTO_INPUT_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make index ab8142c71..2a5a80391 100644 --- a/rules/xorg-proto-kb.make +++ b/rules/xorg-proto-kb.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-kb.targetinstall: $(xorg-proto-kb_targetinstall_deps_defa xorg-proto-kb_clean: rm -rf $(STATEDIR)/xorg-proto-kb.* - rm -rf $(IMAGEDIR)/xorg-proto-kb_* + rm -rf $(PKGDIR)/xorg-proto-kb_* rm -rf $(XORG_PROTO_KB_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make index 2b875e116..93343148b 100644 --- a/rules/xorg-proto-print.make +++ b/rules/xorg-proto-print.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-print.targetinstall: $(xorg-proto-print_targetinstall_dep xorg-proto-print_clean: rm -rf $(STATEDIR)/xorg-proto-print.* - rm -rf $(IMAGEDIR)/xorg-proto-print_* + rm -rf $(PKGDIR)/xorg-proto-print_* rm -rf $(XORG_PROTO_PRINT_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make index f24c66998..1ce41362d 100644 --- a/rules/xorg-proto-randr.make +++ b/rules/xorg-proto-randr.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-randr.targetinstall: $(xorg-proto-randr_targetinstall_dep xorg-proto-randr_clean: rm -rf $(STATEDIR)/xorg-proto-randr.* - rm -rf $(IMAGEDIR)/xorg-proto-randr_* + rm -rf $(PKGDIR)/xorg-proto-randr_* rm -rf $(XORG_PROTO_RANDR_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make index b7a0dcaa2..7027e2ee3 100644 --- a/rules/xorg-proto-record.make +++ b/rules/xorg-proto-record.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-record.targetinstall: $(xorg-proto-record_targetinstall_d xorg-proto-record_clean: rm -rf $(STATEDIR)/xorg-proto-record.* - rm -rf $(IMAGEDIR)/xorg-proto-record_* + rm -rf $(PKGDIR)/xorg-proto-record_* rm -rf $(XORG_PROTO_RECORD_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make index 0fb5221e9..41bbb9c2f 100644 --- a/rules/xorg-proto-render.make +++ b/rules/xorg-proto-render.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-render.targetinstall: $(xorg-proto-render_targetinstall_d xorg-proto-render_clean: rm -rf $(STATEDIR)/xorg-proto-render.* - rm -rf $(IMAGEDIR)/xorg-proto-render_* + rm -rf $(PKGDIR)/xorg-proto-render_* rm -rf $(XORG_PROTO_RENDER_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make index 28fb45bde..9e2b97f43 100644 --- a/rules/xorg-proto-resource.make +++ b/rules/xorg-proto-resource.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-resource.targetinstall: $(xorg-proto-resource_targetinsta xorg-proto-resource_clean: rm -rf $(STATEDIR)/xorg-proto-resource.* - rm -rf $(IMAGEDIR)/xorg-proto-resource_* + rm -rf $(PKGDIR)/xorg-proto-resource_* rm -rf $(XORG_PROTO_RESOURCE_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make index 6dafa322c..09dc6d634 100644 --- a/rules/xorg-proto-scrnsaver.make +++ b/rules/xorg-proto-scrnsaver.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-scrnsaver.targetinstall: $(xorg-proto-scrnsaver_targetins xorg-proto-scrnsaver_clean: rm -rf $(STATEDIR)/xorg-proto-scrnsaver.* - rm -rf $(IMAGEDIR)/xorg-proto-scrnsaver_* + rm -rf $(PKGDIR)/xorg-proto-scrnsaver_* rm -rf $(XORG_PROTO_SCRNSAVER_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-trap.make b/rules/xorg-proto-trap.make index 95bf3d780..b8b0d36cf 100644 --- a/rules/xorg-proto-trap.make +++ b/rules/xorg-proto-trap.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-trap.targetinstall: $(xorg-proto-trap_targetinstall_deps_ xorg-proto-trap_clean: rm -rf $(STATEDIR)/xorg-proto-trap.* - rm -rf $(IMAGEDIR)/xorg-proto-trap_* + rm -rf $(PKGDIR)/xorg-proto-trap_* rm -rf $(XORG_PROTO_TRAP_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make index f41d9ace9..dc9ee91eb 100644 --- a/rules/xorg-proto-video.make +++ b/rules/xorg-proto-video.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-video.targetinstall: $(xorg-proto-video_targetinstall_dep xorg-proto-video_clean: rm -rf $(STATEDIR)/xorg-proto-video.* - rm -rf $(IMAGEDIR)/xorg-proto-video_* + rm -rf $(PKGDIR)/xorg-proto-video_* rm -rf $(XORG_PROTO_VIDEO_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make index 1b9b83127..b0bf8af6f 100644 --- a/rules/xorg-proto-windowswm.make +++ b/rules/xorg-proto-windowswm.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-windowswm.targetinstall: $(xorg-proto-windowswm_targetins xorg-proto-windowswm_clean: rm -rf $(STATEDIR)/xorg-proto-windowswm.* - rm -rf $(IMAGEDIR)/xorg-proto-windowswm_* + rm -rf $(PKGDIR)/xorg-proto-windowswm_* rm -rf $(XORG_PROTO_WINDOWSWM_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make index 7e89e4f68..7c4dc292a 100644 --- a/rules/xorg-proto-x.make +++ b/rules/xorg-proto-x.make @@ -124,7 +124,7 @@ $(STATEDIR)/xorg-proto-x.targetinstall: $(xorg-proto-x_targetinstall_deps_defaul xorg-proto-x_clean: rm -rf $(STATEDIR)/xorg-proto-x.* - rm -rf $(IMAGEDIR)/xorg-proto-x_* + rm -rf $(PKGDIR)/xorg-proto-x_* rm -rf $(XORG_PROTO_X_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make index 03710af83..39b253d33 100644 --- a/rules/xorg-proto-xcmisc.make +++ b/rules/xorg-proto-xcmisc.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xcmisc.targetinstall: $(xorg-proto-xcmisc_targetinstall_d xorg-proto-xcmisc_clean: rm -rf $(STATEDIR)/xorg-proto-xcmisc.* - rm -rf $(IMAGEDIR)/xorg-proto-xcmisc_* + rm -rf $(PKGDIR)/xorg-proto-xcmisc_* rm -rf $(XORG_PROTO_XCMISC_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make index de8628759..c8b3c4575 100644 --- a/rules/xorg-proto-xext.make +++ b/rules/xorg-proto-xext.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xext.targetinstall: $(xorg-proto-xext_targetinstall_deps_ xorg-proto-xext_clean: rm -rf $(STATEDIR)/xorg-proto-xext.* - rm -rf $(IMAGEDIR)/xorg-proto-xext_* + rm -rf $(PKGDIR)/xorg-proto-xext_* rm -rf $(XORG_PROTO_XEXT_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make index c6af32f5b..f623627d4 100644 --- a/rules/xorg-proto-xf86bigfont.make +++ b/rules/xorg-proto-xf86bigfont.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xf86bigfont.targetinstall: $(xorg-proto-xf86bigfont_targe xorg-proto-xf86bigfont_clean: rm -rf $(STATEDIR)/xorg-proto-xf86bigfont.* - rm -rf $(IMAGEDIR)/xorg-proto-xf86bigfont_* + rm -rf $(PKGDIR)/xorg-proto-xf86bigfont_* rm -rf $(XORG_PROTO_XF86BIGFONT_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make index 7a6947e78..0fcc5a79c 100644 --- a/rules/xorg-proto-xf86dga.make +++ b/rules/xorg-proto-xf86dga.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xf86dga.targetinstall: $(xorg-proto-xf86dga_targetinstall xorg-proto-xf86dga_clean: rm -rf $(STATEDIR)/xorg-proto-xf86dga.* - rm -rf $(IMAGEDIR)/xorg-proto-xf86dga_* + rm -rf $(PKGDIR)/xorg-proto-xf86dga_* rm -rf $(XORG_PROTO_XF86DGA_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make index 24438b086..cec872133 100644 --- a/rules/xorg-proto-xf86dri.make +++ b/rules/xorg-proto-xf86dri.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xf86dri.targetinstall: $(xorg-proto-xf86dri_targetinstall xorg-proto-xf86dri_clean: rm -rf $(STATEDIR)/xorg-proto-xf86dri.* - rm -rf $(IMAGEDIR)/xorg-proto-xf86dri_* + rm -rf $(PKGDIR)/xorg-proto-xf86dri_* rm -rf $(XORG_PROTO_XF86DRI_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make index 33749564a..d29e8e15e 100644 --- a/rules/xorg-proto-xf86misc.make +++ b/rules/xorg-proto-xf86misc.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xf86misc.targetinstall: $(xorg-proto-xf86misc_targetinsta xorg-proto-xf86misc_clean: rm -rf $(STATEDIR)/xorg-proto-xf86misc.* - rm -rf $(IMAGEDIR)/xorg-proto-xf86misc_* + rm -rf $(PKGDIR)/xorg-proto-xf86misc_* rm -rf $(XORG_PROTO_XF86MISC_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xf86rush.make b/rules/xorg-proto-xf86rush.make index a83f21e81..2c17818cb 100644 --- a/rules/xorg-proto-xf86rush.make +++ b/rules/xorg-proto-xf86rush.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xf86rush.targetinstall: $(xorg-proto-xf86rush_targetinsta xorg-proto-xf86rush_clean: rm -rf $(STATEDIR)/xorg-proto-xf86rush.* - rm -rf $(IMAGEDIR)/xorg-proto-xf86rush_* + rm -rf $(PKGDIR)/xorg-proto-xf86rush_* rm -rf $(XORG_PROTO_XF86RUSH_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make index 29a144cf5..ff2359e43 100644 --- a/rules/xorg-proto-xf86vidmode.make +++ b/rules/xorg-proto-xf86vidmode.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xf86vidmode.targetinstall: $(xorg-proto-xf86vidmode_targe xorg-proto-xf86vidmode_clean: rm -rf $(STATEDIR)/xorg-proto-xf86vidmode.* - rm -rf $(IMAGEDIR)/xorg-proto-xf86vidmode_* + rm -rf $(PKGDIR)/xorg-proto-xf86vidmode_* rm -rf $(XORG_PROTO_XF86VIDMODE_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make index 22990c8f5..af7ddf7cb 100644 --- a/rules/xorg-proto-xinerama.make +++ b/rules/xorg-proto-xinerama.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xinerama.targetinstall: $(xorg-proto-xinerama_targetinsta xorg-proto-xinerama_clean: rm -rf $(STATEDIR)/xorg-proto-xinerama.* - rm -rf $(IMAGEDIR)/xorg-proto-xinerama_* + rm -rf $(PKGDIR)/xorg-proto-xinerama_* rm -rf $(XORG_PROTO_XINERAMA_DIR) # vim: syntax=make diff --git a/rules/xorg-proto-xproxymanagement.make b/rules/xorg-proto-xproxymanagement.make index fae4958b7..7c8a7e481 100644 --- a/rules/xorg-proto-xproxymanagement.make +++ b/rules/xorg-proto-xproxymanagement.make @@ -112,7 +112,7 @@ $(STATEDIR)/xorg-proto-xproxymanagement.targetinstall: $(xorg-proto-xproxymanage xorg-proto-xproxymanagement_clean: rm -rf $(STATEDIR)/xorg-proto-xproxymanagement.* - rm -rf $(IMAGEDIR)/xorg-proto-xproxymanagement_* + rm -rf $(PKGDIR)/xorg-proto-xproxymanagement_* rm -rf $(XORG_PROTO_XPROXYMANAGEMENT_DIR) # vim: syntax=make diff --git a/rules/xorg-server.make b/rules/xorg-server.make index 674bfaf07..31c261eb4 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -607,7 +607,7 @@ endif # PTXCONF_XORG_SERVER_XORG xorg-server_clean: rm -rf $(STATEDIR)/xorg-server.* - rm -rf $(IMAGEDIR)/xorg-server_* + rm -rf $(PKGDIR)/xorg-server_* rm -rf $(XORG_SERVER_DIR) # vim: syntax=make diff --git a/rules/xterm.make b/rules/xterm.make index 56223c3f3..dadc6755c 100644 --- a/rules/xterm.make +++ b/rules/xterm.make @@ -128,7 +128,7 @@ $(STATEDIR)/xterm.targetinstall: $(xterm_targetinstall_deps_default) xterm_clean: rm -rf $(STATEDIR)/xterm.* - rm -rf $(IMAGEDIR)/xterm_* + rm -rf $(PKGDIR)/xterm_* rm -rf $(XTERM_DIR) # vim: syntax=make diff --git a/rules/zebra.make b/rules/zebra.make index 1c1b6cd82..da02100a6 100644 --- a/rules/zebra.make +++ b/rules/zebra.make @@ -122,7 +122,7 @@ $(STATEDIR)/zebra.targetinstall: $(zebra_targetinstall_deps_default) zebra_clean: rm -rf $(STATEDIR)/zebra.* - rm -rf $(IMAGEDIR)/zebra_* + rm -rf $(PKGDIR)/zebra_* rm -rf $(ZEBRA_DIR) # vim: syntax=make diff --git a/rules/zip.make b/rules/zip.make index f1cb11253..ef3b5703a 100644 --- a/rules/zip.make +++ b/rules/zip.make @@ -127,7 +127,7 @@ endif zip_clean: rm -rf $(STATEDIR)/zip.* - rm -rf $(IMAGEDIR)/zip_* + rm -rf $(PKGDIR)/zip_* rm -rf $(ZIP_DIR) # vim: syntax=make diff --git a/rules/zlib.make b/rules/zlib.make index 6d8682acc..25264b32f 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -134,7 +134,7 @@ endif zlib_clean: rm -rf $(STATEDIR)/zlib.* - rm -rf $(IMAGEDIR)/zlib_* + rm -rf $(PKGDIR)/zlib_* rm -rf $(ZLIB_DIR) # vim: syntax=make |