Changeset 3676


Ignore:
Timestamp:
2006-04-20T02:03:19+02:00 (12 years ago)
Author:
nbd
Message:

revert some previous changes and add another bugfix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/package/rules.mk

    r3675 r3676  
    4141 
    4242define BuildPackage 
    43 $$(eval $$(call Package/Default)) 
    44 $$(eval $$(call Package/$(1))) 
     43$(eval $(call Package/Default)) 
     44$(eval $(call Package/$(1))) 
    4545 
    4646ifeq ($$(TITLE),) 
     
    7575 
    7676IDEPEND_$(1):=$$(strip $$(DEPENDS)) 
    77 CONTROLINFO_$(1) = \ 
    78         echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control; \ 
    79         echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    80         echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; \ 
    81         echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    82         echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    83         echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    84         echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    85         echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    86         echo "Description: $$(TITLE)" >> $$(IDIR_$(1))/CONTROL/control; \ 
    87         echo "$$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control; 
     77 
     78DUMPINFO += \ 
     79        echo "Package: $(1)"; \ 
     80        echo "Version: $(VERSION)"; \ 
     81        echo "Depends: $(IDEPEND_$(1))"; \ 
     82        echo "Title: $(TITLE)"; \ 
     83        echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ 
     84        echo; \ 
     85        echo "$(URL)"; \ 
     86        echo "@@"; 
     87 
    8888 
    8989$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared 
    9090        mkdir -p $$(IDIR_$(1))/CONTROL 
    91         $$(CONTROLINFO_$(1)) 
     91        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control 
     92        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control 
     93        echo "Depends: $(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control 
     94        echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control 
     95        echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control 
     96        echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control 
     97        echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control 
     98        echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control 
     99        echo "Description: $(TITLE)" >> $$(IDIR_$(1))/CONTROL/control 
     100        echo "$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control 
    92101        chmod 644 $$(IDIR_$(1))/CONTROL/control 
    93102        for file in conffiles preinst postinst prerm postrm; do \ 
     
    105114        rm -f $$(IPKG_$(1)) 
    106115clean: $(1)-clean 
    107  
    108 DUMPINFO += \ 
    109         echo "Package: $(1)"; \ 
    110         echo "Version: $$(VERSION)"; \ 
    111         echo "Depends: $$(IDEPEND_$(1))"; \ 
    112         echo "Title: $$(TITLE)"; \ 
    113         echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ 
    114         echo; \ 
    115         echo "$$(URL)"; \ 
    116         echo "@@"; 
    117116 
    118117PACKAGES += $(1) 
Note: See TracChangeset for help on using the changeset viewer.