summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-19 21:30:44 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-19 21:30:44 +0000
commit662991ad07bf30fd3883168b9974849855dd7cef (patch)
tree21b4dd297810a8ca923d902f04b278cf1cf7d6cb
parente1689730e463183e1ebdb69ad780d3f3ae2b4c0e (diff)
Tweak package build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@978 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/usbutils/Makefile8
-rw-r--r--package/vsftpd/Makefile12
-rw-r--r--package/wol/Makefile14
-rw-r--r--package/xinetd/Makefile8
4 files changed, 21 insertions, 21 deletions
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 84502e66a..02f9d440b 100644
--- a/package/usbutils/Makefile
+++ b/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/package/vsftpd/Makefile b/package/vsftpd/Makefile
index a8b32f1e8..1801d808c 100644
--- a/package/vsftpd/Makefile
+++ b/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/package/wol/Makefile b/package/wol/Makefile
index b3339bb2a..3a8811686 100644
--- a/package/wol/Makefile
+++ b/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/package/xinetd/Makefile b/package/xinetd/Makefile
index 71b9cf2de..7dcb20e83 100644
--- a/package/xinetd/Makefile
+++ b/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