X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3ccf6bb2c66a71037debf198b1f3f6f065594549..8ecfceee5e12ce55a549f2b30463ffd8db3501bd:/package/ncurses/Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index d8fd4ff89..5139a5a4a 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -67,19 +67,19 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		--with-shared \
 		--with-normal \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		BUILD_CC="$(TARGET_CC)" \
 		HOSTCC="$(HOSTCC)" \
-		HOSTCCFLAGS="\$$(CPPFLAGS)"
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+		HOSTCCFLAGS="\$$(CPPFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 	
 $(IPKG_LIBNCURSES):
 	install -d -m0755 $(IDIR_LIBNCURSES)/usr/lib
@@ -103,18 +103,19 @@ $(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} $(STAGING_DIR)/usr/lib/
+	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libncurses.so
 
 uninstall-dev:
 	rm -rf \
-	  $(PKG_INSTALL_DIR)/usr/include/curses.h \
-	  $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h \
-	  $(PKG_INSTALL_DIR)/usr/include/panel.h \
-	  $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h \
-	  $(PKG_INSTALL_DIR)/usr/include/unctrl.h \
-	  $(PKG_INSTALL_DIR)/usr/lib/libcurses.so \
-	  $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} \
+		$(STAGING_DIR)/usr/include/curses.h \
+		$(STAGING_DIR)/usr/include/{ncurses,panel}.h \
+		$(STAGING_DIR)/usr/include/panel.h \
+		$(STAGING_DIR)/usr/include/term{,cap}.h \
+		$(STAGING_DIR)/usr/include/unctrl.h \
+		$(STAGING_DIR)/usr/lib/libcurses.so \
+		$(STAGING_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} \
 
 compile: install-dev
 clean: uninstall-dev