normalize Makefiles.

[oweals/openwrt.git] / openwrt / package / rules.mk

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index d44cd986a497487e0f4c426fe8bc8b040a2e7564..40e07f839fe2a72a821c60f1ced2b4a43ff96784 100644 (file)
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -47,7 +47,7 @@ define Build/DefaultTargets
        rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
 
   package-rebuild: FORCE
-       @-rm $(PKG_BUILD_DIR)/.built
+       @-rm -f $(PKG_BUILD_DIR)/.built
 
   define Build/DefaultTargets
   endef
@@ -77,6 +77,12 @@ define Package/Default
   DESCRIPTION:=
 endef
 
+define BuildIPKGVariable
+pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
+export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
+$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi;
+endef
+
 define BuildPackage
   $(eval $(call Package/Default))
   $(eval $(call Package/$(1)))
@@ -145,6 +151,11 @@ define BuildPackage
        echo "@@";
   endif
 
+  $(eval $(call BuildIPKGVariable,$(1),conffiles))
+  $(eval $(call BuildIPKGVariable,$(1),preinst))
+  $(eval $(call BuildIPKGVariable,$(1),postinst))
+  $(eval $(call BuildIPKGVariable,$(1),prerm))
+  $(eval $(call BuildIPKGVariable,$(1),postrm))
   $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
@@ -163,9 +174,9 @@ define BuildPackage
        echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
        echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
        chmod 644 $$(IDIR_$(1))/CONTROL/control
-       for file in conffiles preinst postinst prerm postrm; do \
-               [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
-       done
+       (cd $$(IDIR_$(1))/CONTROL; \
+               $($(1)_COMMANDS) \
+       )
 
   $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
        $(call Package/$(1)/install,$$(IDIR_$(1)))
@@ -211,8 +222,9 @@ define Build/Prepare
 endef
 
 define Build/Configure/Default
-       @(cd $(PKG_BUILD_DIR); \
+       @(cd $(PKG_BUILD_DIR)/$(3); \
        [ -x configure ] && \
+               $(2) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -257,10 +269,6 @@ define Build/Compile
   $(call Build/Compile/Default,)
 endef
 
-define Build/Clean
-       $(MAKE) clean
-endef
-
 ifneq ($(DUMP),)
   dumpinfo: FORCE
        @$(DUMPINFO)
@@ -282,5 +290,6 @@ else
   clean-targets:
   clean: FORCE
        @$(MAKE) clean-targets
+       $(call Build/Clean)
        rm -rf $(PKG_BUILD_DIR)
 endif