From b3a10b754621fcae357be6aecb9124596848e2d1 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 19 May 2005 21:30:44 +0000 Subject: [PATCH] Tweak package build SVN-Revision: 978 --- openwrt/package/usbutils/Makefile | 8 ++++---- openwrt/package/vsftpd/Makefile | 12 ++++++------ openwrt/package/wol/Makefile | 14 +++++++------- openwrt/package/xinetd/Makefile | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/openwrt/package/usbutils/Makefile b/openwrt/package/usbutils/Makefile index 84502e66a7..02f9d440b9 100644 --- a/openwrt/package/usbutils/Makefile +++ b/openwrt/package/usbutils/Makefile @@ -48,15 +48,15 @@ $(PKG_BUILD_DIR)/.configured: --enable-shared \ --disable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LSUSB): install -d -m0755 $(IDIR_LSUSB)/usr/share diff --git a/openwrt/package/vsftpd/Makefile b/openwrt/package/vsftpd/Makefile index a8b32f1e8a..1801d808ca 100644 --- a/openwrt/package/vsftpd/Makefile +++ b/openwrt/package/vsftpd/Makefile @@ -19,17 +19,17 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,VSFTPD,vsftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + vsftpd install + touch $@ $(IPKG_VSFTPD): install -d -m0755 $(IDIR_VSFTPD)/etc diff --git a/openwrt/package/wol/Makefile b/openwrt/package/wol/Makefile index b3339bb2a4..3a8811686e 100644 --- a/openwrt/package/wol/Makefile +++ b/openwrt/package/wol/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,WOL,wol,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -48,16 +48,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_WOL): install -m0755 -d $(IDIR_WOL)/usr/bin diff --git a/openwrt/package/xinetd/Makefile b/openwrt/package/xinetd/Makefile index 71b9cf2dea..7dcb20e83e 100644 --- a/openwrt/package/xinetd/Makefile +++ b/openwrt/package/xinetd/Makefile @@ -49,15 +49,15 @@ $(PKG_BUILD_DIR)/.configured: --without-libwrap \ --with-loadavg \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + build install + touch $@ $(IPKG_XINETD): install -d -m0755 $(IDIR_XINETD)/etc -- 2.25.1