X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e7a64765ac6dd0facfa7da5ec053702b8a05fe1f..62adcb808c8ff00b33280f3df32c6af41dd1f07f:/include/package.mk?ds=sidebyside

diff --git a/include/package.mk b/include/package.mk
index 1edac0e0a..dd70128c8 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -20,9 +20,8 @@ export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
-      _INFO:=
-      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-        _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
+        $$(info Forcing package rebuild)
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
     endif
@@ -178,8 +177,10 @@ define BuildPackage
 	echo "Depends: $$(IDEPEND_$(1))"; \
 	echo "Provides: $(PROVIDES)"; \
 	echo "Build-Depends: $(PKG_BUILDDEP)"; \
+	echo "Section: $(SECTION)"; \
 	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
+	echo "Maintainer: $(MAINTAINER)"; \
 	if isset $(call shvar,Package/$(1)/description); then \
 		echo -n "Description: "; \
 		getvar $(call shvar,Package/$(1)/description); \
@@ -262,12 +263,8 @@ define BuildPackage
       ifneq ($(MAKECMDGOALS),prereq)
         ifneq ($(DUMP),1)
           ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
-            _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
             $(PKG_BUILD_DIR)/.built: package-rebuild
-          endif
-
-          ifneq ($$(_INFO),)
-            $$(info Rebuilding $$(_INFO))
+            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
           endif
         endif
       endif
@@ -296,7 +293,7 @@ define Build/Configure/Default
 		CXXFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		$(2) \
 		$(PKG_CONFIG_PATH)/configure \
 		--target=$(GNU_TARGET_NAME) \