Changeset 1327

Show
Ignore:
Timestamp:
03/13/05 23:02:29 (5 years ago)
Author:
rwhitby
Message:

Patched to use TARGET_ARCH - @FOO@ variables put in some control files, and modified on the fly using sed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/make/adns.mk

    r852 r1327  
    5555ADNS_SOURCE_DIR=$(SOURCE_DIR)/adns 
    5656ADNS_IPK_DIR=$(BUILD_DIR)/adns-$(ADNS_VERSION)-ipk 
    57 ADNS_IPK=$(BUILD_DIR)/adns_$(ADNS_VERSION)-$(ADNS_IPK_VERSION)_armeb.ipk 
     57ADNS_IPK=$(BUILD_DIR)/adns_$(ADNS_VERSION)-$(ADNS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    148148# 
    149149$(ADNS_IPK): $(ADNS_BUILD_DIR)/.built 
    150         rm -rf $(ADNS_IPK_DIR) $(BUILD_DIR)/adns_*_armeb.ipk 
     150        rm -rf $(ADNS_IPK_DIR) $(BUILD_DIR)/adns_*_$(TARGET_ARCH).ipk 
    151151        install -d $(ADNS_IPK_DIR)/opt/lib/ 
    152152        install -m 644 $(ADNS_BUILD_DIR)/src/libadns.a $(ADNS_IPK_DIR)/opt/lib/libadns.a 
  • trunk/make/alsa-lib.mk

    r1254 r1327  
    6060ALSA-LIB_SOURCE_DIR=$(SOURCE_DIR)/alsa-lib 
    6161ALSA-LIB_IPK_DIR=$(BUILD_DIR)/alsa-lib-$(ALSA-LIB_VERSION)-ipk 
    62 ALSA-LIB_IPK=$(BUILD_DIR)/alsa-lib_$(ALSA-LIB_VERSION)-$(ALSA-LIB_IPK_VERSION)_armeb.ipk 
     62ALSA-LIB_IPK=$(BUILD_DIR)/alsa-lib_$(ALSA-LIB_VERSION)-$(ALSA-LIB_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    147147# 
    148148$(ALSA-LIB_IPK): $(ALSA-LIB_BUILD_DIR)/.built 
    149         rm -rf $(ALSA-LIB_IPK_DIR) $(BUILD_DIR)/alsa-lib_*_armeb.ipk 
     149        rm -rf $(ALSA-LIB_IPK_DIR) $(BUILD_DIR)/alsa-lib_*_$(TARGET_ARCH).ipk 
    150150        $(MAKE) -C $(ALSA-LIB_BUILD_DIR) DESTDIR=$(ALSA-LIB_IPK_DIR) install 
    151151        install -d $(ALSA-LIB_IPK_DIR)/CONTROL 
  • trunk/make/alsa-oss.mk

    r1254 r1327  
    6060ALSA-OSS_SOURCE_DIR=$(SOURCE_DIR)/alsa-oss 
    6161ALSA-OSS_IPK_DIR=$(BUILD_DIR)/alsa-oss-$(ALSA-OSS_VERSION)-ipk 
    62 ALSA-OSS_IPK=$(BUILD_DIR)/alsa-oss_$(ALSA-OSS_VERSION)-$(ALSA-OSS_IPK_VERSION)_armeb.ipk 
     62ALSA-OSS_IPK=$(BUILD_DIR)/alsa-oss_$(ALSA-OSS_VERSION)-$(ALSA-OSS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(ALSA-OSS_IPK): $(ALSA-OSS_BUILD_DIR)/.built 
    150         rm -rf $(ALSA-OSS_IPK_DIR) $(BUILD_DIR)/alsa-oss_*_armeb.ipk 
     150        rm -rf $(ALSA-OSS_IPK_DIR) $(BUILD_DIR)/alsa-oss_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(ALSA-OSS_BUILD_DIR) DESTDIR=$(ALSA-OSS_IPK_DIR) install 
    152152        install -d $(ALSA-OSS_IPK_DIR)/CONTROL 
  • trunk/make/alsa-utils.mk

    r1254 r1327  
    6060ALSA-UTILS_SOURCE_DIR=$(SOURCE_DIR)/alsa-utils 
    6161ALSA-UTILS_IPK_DIR=$(BUILD_DIR)/alsa-utils-$(ALSA-UTILS_VERSION)-ipk 
    62 ALSA-UTILS_IPK=$(BUILD_DIR)/alsa-utils_$(ALSA-UTILS_VERSION)-$(ALSA-UTILS_IPK_VERSION)_armeb.ipk 
     62ALSA-UTILS_IPK=$(BUILD_DIR)/alsa-utils_$(ALSA-UTILS_VERSION)-$(ALSA-UTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(ALSA-UTILS_IPK): $(ALSA-UTILS_BUILD_DIR)/.built 
    150         rm -rf $(ALSA-UTILS_IPK_DIR) $(BUILD_DIR)/alsa-utils_*_armeb.ipk 
     150        rm -rf $(ALSA-UTILS_IPK_DIR) $(BUILD_DIR)/alsa-utils_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(ALSA-UTILS_BUILD_DIR) DESTDIR=$(ALSA-UTILS_IPK_DIR) install 
    152152        install -d $(ALSA-UTILS_IPK_DIR)/CONTROL 
  • trunk/make/amule.mk

    r841 r1327  
    5656AMULE_SOURCE_DIR=$(SOURCE_DIR)/amule 
    5757AMULE_IPK_DIR=$(BUILD_DIR)/amule-$(AMULE_PRD_VERSION)-ipk 
    58 AMULE_IPK=$(BUILD_DIR)/amule_$(AMULE_PRD_VERSION)-$(AMULE_IPK_VERSION)_armeb.ipk 
     58AMULE_IPK=$(BUILD_DIR)/amule_$(AMULE_PRD_VERSION)-$(AMULE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    151151# 
    152152$(AMULE_IPK): $(AMULE_BUILD_DIR)/.built 
    153         rm -rf $(AMULE_IPK_DIR) $(BUILD_DIR)/amule_*_armeb.ipk 
     153        rm -rf $(AMULE_IPK_DIR) $(BUILD_DIR)/amule_*_$(TARGET_ARCH).ipk 
    154154        install -d $(AMULE_IPK_DIR)/opt/bin 
    155155        $(STRIP_COMMAND) $(AMULE_BUILD_DIR)/src/amuled -o $(AMULE_IPK_DIR)/opt/bin/amuled 
  • trunk/make/apache.mk

    r1259 r1327  
    6868APACHE_SOURCE_DIR=$(SOURCE_DIR)/apache 
    6969APACHE_IPK_DIR=$(BUILD_DIR)/apache-$(APACHE_VERSION)-ipk 
    70 APACHE_IPK=$(BUILD_DIR)/apache_$(APACHE_VERSION)-$(APACHE_IPK_VERSION)_armeb.ipk 
     70APACHE_IPK=$(BUILD_DIR)/apache_$(APACHE_VERSION)-$(APACHE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    7171APACHE_MANUAL_IPK_DIR=$(BUILD_DIR)/apache-manual-$(APACHE_VERSION)-ipk 
    72 APACHE_MANUAL_IPK=$(BUILD_DIR)/apache-manual_$(APACHE_VERSION)-$(APACHE_IPK_VERSION)_armeb.ipk 
     72APACHE_MANUAL_IPK=$(BUILD_DIR)/apache-manual_$(APACHE_VERSION)-$(APACHE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    7373 
    7474# 
     
    7979        @rm -f $@ 
    8080        @echo "Package: apache" >>$@ 
    81         @echo "Architecture: armeb" >>$@ 
     81        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    8282        @echo "Priority: $(APACHE_PRIORITY)" >>$@ 
    8383        @echo "Section: $(APACHE_SECTION)" >>$@ 
     
    9292        @rm -f $@ 
    9393        @echo "Package: apache-manual" >>$@ 
    94         @echo "Architecture: armeb" >>$@ 
     94        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    9595        @echo "Priority: $(APACHE_PRIORITY)" >>$@ 
    9696        @echo "Section: $(APACHE_SECTION)" >>$@ 
     
    218218# 
    219219$(APACHE_IPK): $(APACHE_BUILD_DIR)/.built 
    220         rm -rf $(APACHE_IPK_DIR) $(BUILD_DIR)/apache_*_armeb.ipk 
     220        rm -rf $(APACHE_IPK_DIR) $(BUILD_DIR)/apache_*_$(TARGET_ARCH).ipk 
    221221        $(MAKE) -C $(APACHE_BUILD_DIR) DESTDIR=$(APACHE_IPK_DIR) installbuilddir=/opt/share/apache2/build install 
    222222        rm -rf $(APACHE_IPK_DIR)/opt/share/apache2/manual 
  • trunk/make/appweb.mk

    r736 r1327  
    5757APPWEB_SOURCE_DIR=$(SOURCE_DIR)/appweb 
    5858APPWEB_IPK_DIR=$(BUILD_DIR)/appweb-$(APPWEB_VERSION)-ipk 
    59 APPWEB_IPK=$(BUILD_DIR)/appweb_$(APPWEB_VERSION)-$(APPWEB_IPK_VERSION)_armeb.ipk 
     59APPWEB_IPK=$(BUILD_DIR)/appweb_$(APPWEB_VERSION)-$(APPWEB_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6060 
    6161# 
     
    147147# 
    148148$(APPWEB_IPK): $(APPWEB_BUILD_DIR)/bin/appWeb 
    149         rm -rf $(APPWEB_IPK_DIR) $(BUILD_DIR)/appweb_*_armeb.ipk 
     149        rm -rf $(APPWEB_IPK_DIR) $(BUILD_DIR)/appweb_*_$(TARGET_ARCH).ipk 
    150150        # Copy file package ./http/package/LINUX/http.files ... 
    151151        install -d $(APPWEB_IPK_DIR)/opt/sbin 
  • trunk/make/apr-util.mk

    r1231 r1327  
    6363APR_UTIL_SOURCE_DIR=$(SOURCE_DIR)/apr-util 
    6464APR_UTIL_IPK_DIR=$(BUILD_DIR)/apr-util-$(APR_UTIL_VERSION)-ipk 
    65 APR_UTIL_IPK=$(BUILD_DIR)/apr-util_$(APR_UTIL_VERSION)-$(APR_UTIL_IPK_VERSION)_armeb.ipk 
     65APR_UTIL_IPK=$(BUILD_DIR)/apr-util_$(APR_UTIL_VERSION)-$(APR_UTIL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: apr-util" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(APR_UTIL_PRIORITY)" >>$@ 
    7676        @echo "Section: $(APR_UTIL_SECTION)" >>$@ 
     
    184184# 
    185185$(APR_UTIL_IPK): $(APR_UTIL_BUILD_DIR)/.built 
    186         rm -rf $(APR_UTIL_IPK_DIR) $(BUILD_DIR)/apr-util_*_armeb.ipk 
     186        rm -rf $(APR_UTIL_IPK_DIR) $(BUILD_DIR)/apr-util_*_$(TARGET_ARCH).ipk 
    187187        $(MAKE) -C $(APR_UTIL_BUILD_DIR) DESTDIR=$(APR_UTIL_IPK_DIR) libdir=/opt/lib prefix=/delete-me install 
    188188        rm -rf $(APR_UTIL_IPK_DIR)/delete-me 
  • trunk/make/apr.mk

    r1184 r1327  
    6363APR_SOURCE_DIR=$(SOURCE_DIR)/apr 
    6464APR_IPK_DIR=$(BUILD_DIR)/apr-$(APR_VERSION)-ipk 
    65 APR_IPK=$(BUILD_DIR)/apr_$(APR_VERSION)-$(APR_IPK_VERSION)_armeb.ipk 
     65APR_IPK=$(BUILD_DIR)/apr_$(APR_VERSION)-$(APR_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: apr" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(APR_PRIORITY)" >>$@ 
    7676        @echo "Section: $(APR_SECTION)" >>$@ 
     
    171171# 
    172172$(APR_IPK): $(APR_BUILD_DIR)/.built 
    173         rm -rf $(APR_IPK_DIR) $(BUILD_DIR)/apr_*_armeb.ipk 
     173        rm -rf $(APR_IPK_DIR) $(BUILD_DIR)/apr_*_$(TARGET_ARCH).ipk 
    174174        $(MAKE) -C $(APR_BUILD_DIR) DESTDIR=$(APR_IPK_DIR) libdir=/opt/lib prefix=/delete-me install 
    175175        rm -rf $(APR_IPK_DIR)/delete-me 
  • trunk/make/asterisk.mk

    r1306 r1327  
    5656ASTERISK_SOURCE_DIR=$(SOURCE_DIR)/asterisk 
    5757ASTERISK_IPK_DIR=$(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)-ipk 
    58 ASTERISK_IPK=$(BUILD_DIR)/asterisk_$(ASTERISK_VERSION)-$(ASTERISK_IPK_VERSION)_armeb.ipk 
     58ASTERISK_IPK=$(BUILD_DIR)/asterisk_$(ASTERISK_VERSION)-$(ASTERISK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060ASTERISK_INST_DIR=/opt 
     
    147147# 
    148148$(ASTERISK_IPK): $(ASTERISK_BUILD_DIR)/.built 
    149         rm -rf $(ASTERISK_IPK_DIR) $(BUILD_DIR)/asterisk_*_armeb.ipk 
     149        rm -rf $(ASTERISK_IPK_DIR) $(BUILD_DIR)/asterisk_*_$(TARGET_ARCH).ipk 
    150150        ($(MAKE) -C $(ASTERISK_BUILD_DIR) DESTDIR=$(ASTERISK_IPK_DIR) \ 
    151151                INSTALL_PREFIX=$(ASTERISK_INST_DIR) \ 
  • trunk/make/atftp.mk

    r661 r1327  
    1616ATFTP_SOURCE_DIR=$(SOURCE_DIR)/atftp 
    1717ATFTP_IPK_DIR=$(BUILD_DIR)/atftp-$(ATFTP_VERSION)-ipk 
    18 ATFTP_IPK=$(BUILD_DIR)/atftp_$(ATFTP_VERSION)-$(ATFTP_IPK_VERSION)_armeb.ipk 
     18ATFTP_IPK=$(BUILD_DIR)/atftp_$(ATFTP_VERSION)-$(ATFTP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1919 
    2020$(DL_DIR)/$(ATFTP_SOURCE): 
     
    4848 
    4949$(ATFTP_IPK): $(ATFTP_BUILD_DIR)/atftp 
    50         rm -rf $(ATFTP_IPK_DIR) $(BUILD_DIR)/atftp_*_armeb.ipk 
     50        rm -rf $(ATFTP_IPK_DIR) $(BUILD_DIR)/atftp_*_$(TARGET_ARCH).ipk 
    5151        install -d $(ATFTP_IPK_DIR)/opt/bin 
    5252        $(STRIP_COMMAND) $(ATFTP_BUILD_DIR)/atftp -o $(ATFTP_IPK_DIR)/opt/bin/atftp 
  • trunk/make/atk.mk

    r1202 r1327  
    6363ATK_SOURCE_DIR=$(SOURCE_DIR)/atk 
    6464ATK_IPK_DIR=$(BUILD_DIR)/atk-$(ATK_VERSION)-ipk 
    65 ATK_IPK=$(BUILD_DIR)/atk_$(ATK_VERSION)-$(ATK_IPK_VERSION)_armeb.ipk 
     65ATK_IPK=$(BUILD_DIR)/atk_$(ATK_VERSION)-$(ATK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: atk" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(ATK_PRIORITY)" >>$@ 
    7676        @echo "Section: $(ATK_SECTION)" >>$@ 
     
    162162# 
    163163$(ATK_IPK): $(ATK_BUILD_DIR)/.built 
    164         rm -rf $(ATK_IPK_DIR) $(BUILD_DIR)/atk_*_armeb.ipk 
     164        rm -rf $(ATK_IPK_DIR) $(BUILD_DIR)/atk_*_$(TARGET_ARCH).ipk 
    165165        $(MAKE) -C $(ATK_BUILD_DIR) DESTDIR=$(ATK_IPK_DIR) install-strip 
    166166        rm -f $(ATK_IPK_DIR)/opt/lib/*.la 
  • trunk/make/autoconf.mk

    r781 r1327  
    6060AUTOCONF_SOURCE_DIR=$(SOURCE_DIR)/autoconf 
    6161AUTOCONF_IPK_DIR=$(BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)-ipk 
    62 AUTOCONF_IPK=$(BUILD_DIR)/autoconf_$(AUTOCONF_VERSION)-$(AUTOCONF_IPK_VERSION)_armeb.ipk 
     62AUTOCONF_IPK=$(BUILD_DIR)/autoconf_$(AUTOCONF_VERSION)-$(AUTOCONF_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    152152# 
    153153$(AUTOCONF_IPK): $(AUTOCONF_BUILD_DIR)/.built 
    154         rm -rf $(AUTOCONF_IPK_DIR) $(BUILD_DIR)/autoconf_*_armeb.ipk 
     154        rm -rf $(AUTOCONF_IPK_DIR) $(BUILD_DIR)/autoconf_*_$(TARGET_ARCH).ipk 
    155155        install -d $(AUTOCONF_IPK_DIR)/opt/bin 
    156156        install -d $(AUTOCONF_IPK_DIR)/opt/info 
  • trunk/make/automake.mk

    r1139 r1327  
    6060AUTOMAKE_SOURCE_DIR=$(SOURCE_DIR)/automake 
    6161AUTOMAKE_IPK_DIR=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION)-ipk 
    62 AUTOMAKE_IPK=$(BUILD_DIR)/automake_$(AUTOMAKE_VERSION)-$(AUTOMAKE_IPK_VERSION)_armeb.ipk 
     62AUTOMAKE_IPK=$(BUILD_DIR)/automake_$(AUTOMAKE_VERSION)-$(AUTOMAKE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    152152# 
    153153$(AUTOMAKE_IPK): $(AUTOMAKE_BUILD_DIR)/.built 
    154         rm -rf $(AUTOMAKE_IPK_DIR) $(BUILD_DIR)/automake_*_armeb.ipk 
     154        rm -rf $(AUTOMAKE_IPK_DIR) $(BUILD_DIR)/automake_*_$(TARGET_ARCH).ipk 
    155155        install -d $(AUTOMAKE_IPK_DIR)/opt/bin 
    156156        install -d $(AUTOMAKE_IPK_DIR)/opt/info 
  • trunk/make/bash.mk

    r863 r1327  
    1919BASH_SOURCE_DIR=$(SOURCE_DIR)/bash 
    2020BASH_IPK_DIR=$(BUILD_DIR)/bash-$(BASH_VERSION)-ipk 
    21 BASH_IPK=$(BUILD_DIR)/bash_$(BASH_VERSION)-$(BASH_IPK_VERSION)_armeb.ipk 
     21BASH_IPK=$(BUILD_DIR)/bash_$(BASH_VERSION)-$(BASH_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2222 
    2323$(DL_DIR)/$(BASH_SOURCE): 
     
    5959 
    6060$(BASH_IPK): $(BASH_BUILD_DIR)/bash 
    61         rm -rf $(BASH_IPK_DIR) $(BUILD_DIR)/bash_*_armeb.ipk 
     61        rm -rf $(BASH_IPK_DIR) $(BUILD_DIR)/bash_*_$(TARGET_ARCH).ipk 
    6262        install -d $(BASH_IPK_DIR)/opt/bin 
    6363        $(STRIP_COMMAND) $(BASH_BUILD_DIR)/bash -o $(BASH_IPK_DIR)/opt/bin/bash 
  • trunk/make/bind.mk

    r907 r1327  
    1818BIND_SOURCE_DIR=$(SOURCE_DIR)/bind 
    1919BIND_IPK_DIR:=$(BUILD_DIR)/bind-$(BIND_VERSION)-ipk 
    20 BIND_IPK=$(BUILD_DIR)/bind_$(BIND_VERSION)-$(BIND_IPK_VERSION)_armeb.ipk 
     20BIND_IPK=$(BUILD_DIR)/bind_$(BIND_VERSION)-$(BIND_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(BIND_SOURCE): 
  • trunk/make/bison.mk

    r739 r1327  
    1313BISON_UNZIP=zcat 
    1414 
    15 BISON_IPK=$(BUILD_DIR)/bison_$(BISON_VERSION)-2_armeb.ipk 
     15BISON_IPK=$(BUILD_DIR)/bison_$(BISON_VERSION)-2_$(TARGET_ARCH).ipk 
    1616BISON_IPK_DIR=$(BUILD_DIR)/bison-$(BISON_VERSION)-ipk 
    1717 
     
    4646 
    4747$(BISON_IPK): $(BISON_DIR)/src/bison 
    48         rm -rf $(BISON_IPK_DIR) $(BUILD_DIR)/bison_*_armeb.ipk 
     48        rm -rf $(BISON_IPK_DIR) $(BUILD_DIR)/bison_*_$(TARGET_ARCH).ipk 
    4949        mkdir -p $(BISON_IPK_DIR)/CONTROL 
    5050        cp $(SOURCE_DIR)/bison.control $(BISON_IPK_DIR)/CONTROL/control 
  • trunk/make/bogofilter.mk

    r1308 r1327  
    2929BOGOFILTER_SOURCE_DIR=$(SOURCE_DIR)/bogofilter 
    3030BOGOFILTER_IPK_DIR=$(BUILD_DIR)/bogofilter-$(BOGOFILTER_VERSION)-ipk 
    31 BOGOFILTER_IPK=$(BUILD_DIR)/bogofilter_$(BOGOFILTER_VERSION)-$(BOGOFILTER_IPK_VERSION)_armeb.ipk 
     31BOGOFILTER_IPK=$(BUILD_DIR)/bogofilter_$(BOGOFILTER_VERSION)-$(BOGOFILTER_IPK_VERSION)_$(TARGET_ARCH).ipk 
    3232 
    3333$(BOGOFILTER_IPK_DIR)/CONTROL/control: 
     
    3535        @rm -f $@ 
    3636        @echo "Package: bogofilter" >>$@ 
    37         @echo "Architecture: armeb" >>$@ 
     37        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    3838        @echo "Priority: $(BOGOFILTER_PRIORITY)" >>$@ 
    3939        @echo "Section: $(BOGOFILTER_SECTION)" >>$@ 
     
    8888 
    8989$(BOGOFILTER_IPK): $(BOGOFILTER_BUILD_DIR)/.built 
    90         rm -rf $(BOGOFILTER_IPK_DIR) $(BUILD_DIR)/bogofilter_*_armeb.ipk 
     90        rm -rf $(BOGOFILTER_IPK_DIR) $(BUILD_DIR)/bogofilter_*_$(TARGET_ARCH).ipk 
    9191        install -d $(BOGOFILTER_IPK_DIR)/opt/bin/ 
    9292        install -d $(BOGOFILTER_IPK_DIR)/opt/sbin/ 
  • trunk/make/busybox.mk

    r896 r1327  
    2525BUSYBOX_SOURCE_DIR=$(SOURCE_DIR)/busybox 
    2626BUSYBOX_IPK_DIR=$(BUILD_DIR)/busybox-$(BUSYBOX_VERSION)-ipk 
    27 BUSYBOX_IPK=$(BUILD_DIR)/busybox_$(BUSYBOX_VERSION)-$(BUSYBOX_IPK_VERSION)_armeb.ipk 
     27BUSYBOX_IPK=$(BUILD_DIR)/busybox_$(BUSYBOX_VERSION)-$(BUSYBOX_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2828 
    2929$(DL_DIR)/$(BUSYBOX_SOURCE): 
     
    5454 
    5555$(BUSYBOX_IPK): $(BUSYBOX_BUILD_DIR)/busybox 
    56         rm -rf $(BUSYBOX_IPK_DIR) $(BUILD_DIR)/busybox_*_armeb.ipk 
     56        rm -rf $(BUSYBOX_IPK_DIR) $(BUILD_DIR)/busybox_*_$(TARGET_ARCH).ipk 
    5757        install -d $(BUSYBOX_IPK_DIR)/opt 
    5858        $(MAKE) CROSS="$(TARGET_CROSS)" PREFIX="$(BUSYBOX_IPK_DIR)/opt" \ 
  • trunk/make/bzflag.mk

    r938 r1327  
    5555BZFLAG_SOURCE_DIR=$(SOURCE_DIR)/bzflag 
    5656BZFLAG_IPK_DIR=$(BUILD_DIR)/bzflag-$(BZFLAG_VERSION)-ipk 
    57 BZFLAG_IPK=$(BUILD_DIR)/bzflag_$(BZFLAG_VERSION)-$(BZFLAG_IPK_VERSION)_armeb.ipk 
     57BZFLAG_IPK=$(BUILD_DIR)/bzflag_$(BZFLAG_VERSION)-$(BZFLAG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    149149# 
    150150$(BZFLAG_IPK): $(BZFLAG_BUILD_DIR)/.built 
    151         rm -rf $(BZFLAG_IPK_DIR) $(BUILD_DIR)/bzflag_*_armeb.ipk 
     151        rm -rf $(BZFLAG_IPK_DIR) $(BUILD_DIR)/bzflag_*_$(TARGET_ARCH).ipk 
    152152        $(MAKE) -C $(BZFLAG_BUILD_DIR) DESTDIR=$(BZFLAG_IPK_DIR) install 
    153153        # contents of /share are not needed by a dedicated server 
  • trunk/make/bzip2.mk

    r739 r1327  
    1616BZIP2_BUILD_DIR=$(BUILD_DIR)/bzip2 
    1717BZIP2_SOURCE_DIR=$(SOURCE_DIR)/bzip2 
    18 BZIP2_IPK=$(BUILD_DIR)/bzip2_$(BZIP2_VERSION)-$(BZIP2_IPK_VERSION)_armeb.ipk 
     18BZIP2_IPK=$(BUILD_DIR)/bzip2_$(BZIP2_VERSION)-$(BZIP2_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1919BZIP2_IPK_DIR=$(BUILD_DIR)/bzip2-$(BZIP2_VERSION)-ipk 
    2020 
     
    5757 
    5858$(BZIP2_IPK): $(BZIP2_BUILD_DIR)/bzip2 
    59         rm -rf $(BZIP2_IPK_DIR) $(BUILD_DIR)/bzip2_*_armeb.ipk 
     59        rm -rf $(BZIP2_IPK_DIR) $(BUILD_DIR)/bzip2_*_$(TARGET_ARCH).ipk 
    6060        install -d $(BZIP2_IPK_DIR)/opt/bin 
    6161        $(STRIP_COMMAND) $(BZIP2_BUILD_DIR)/bzip2 -o $(BZIP2_IPK_DIR)/opt/bin/bzip2 
  • trunk/make/ccxstream.mk

    r739 r1327  
    4141CCXSTREAM_SOURCE_DIR=$(SOURCE_DIR)/ccxstream 
    4242CCXSTREAM_IPK_DIR=$(BUILD_DIR)/ccxstream-$(CCXSTREAM_VERSION)-ipk 
    43 CCXSTREAM_IPK=$(BUILD_DIR)/ccxstream_$(CCXSTREAM_VERSION)-$(CCXSTREAM_IPK_VERSION)_armeb.ipk 
     43CCXSTREAM_IPK=$(BUILD_DIR)/ccxstream_$(CCXSTREAM_VERSION)-$(CCXSTREAM_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4444 
    4545# 
  • trunk/make/centericq.mk

    r1304 r1327  
    6161CENTERICQ_SOURCE_DIR=$(SOURCE_DIR)/centericq 
    6262CENTERICQ_IPK_DIR=$(BUILD_DIR)/centericq-$(CENTERICQ_VERSION)-ipk 
    63 CENTERICQ_IPK=$(BUILD_DIR)/centericq_$(CENTERICQ_VERSION)-$(CENTERICQ_IPK_VERSION)_armeb.ipk 
     63CENTERICQ_IPK=$(BUILD_DIR)/centericq_$(CENTERICQ_VERSION)-$(CENTERICQ_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    154154# 
    155155$(CENTERICQ_IPK): $(CENTERICQ_BUILD_DIR)/.built 
    156         rm -rf $(CENTERICQ_IPK_DIR) $(BUILD_DIR)/centericq_*_armeb.ipk 
     156        rm -rf $(CENTERICQ_IPK_DIR) $(BUILD_DIR)/centericq_*_$(TARGET_ARCH).ipk 
    157157        $(MAKE) -C $(CENTERICQ_BUILD_DIR) DESTDIR=$(CENTERICQ_IPK_DIR) install 
    158158        # Strip the executables 
  • trunk/make/clamav.mk

    r951 r1327  
    6060CLAMAV_SOURCE_DIR=$(SOURCE_DIR)/clamav 
    6161CLAMAV_IPK_DIR=$(BUILD_DIR)/clamav-$(CLAMAV_VERSION)-ipk 
    62 CLAMAV_IPK=$(BUILD_DIR)/clamav_$(CLAMAV_VERSION)-$(CLAMAV_IPK_VERSION)_armeb.ipk 
     62CLAMAV_IPK=$(BUILD_DIR)/clamav_$(CLAMAV_VERSION)-$(CLAMAV_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    150150# 
    151151$(CLAMAV_IPK): $(CLAMAV_BUILD_DIR)/.built 
    152         rm -rf $(CLAMAV_IPK_DIR) $(BUILD_DIR)/clamav_*_armeb.ipk 
     152        rm -rf $(CLAMAV_IPK_DIR) $(BUILD_DIR)/clamav_*_$(TARGET_ARCH).ipk 
    153153        $(MAKE) -C $(CLAMAV_BUILD_DIR) DESTDIR=$(CLAMAV_IPK_DIR) install 
    154154        install -d $(CLAMAV_IPK_DIR)/opt/etc/ 
  • trunk/make/classpath.mk

    r948 r1327  
    6060CLASSPATH_SOURCE_DIR=$(SOURCE_DIR)/classpath 
    6161CLASSPATH_IPK_DIR=$(BUILD_DIR)/classpath-$(CLASSPATH_VERSION)-ipk 
    62 CLASSPATH_IPK=$(BUILD_DIR)/classpath_$(CLASSPATH_VERSION)-$(CLASSPATH_IPK_VERSION)_armeb.ipk 
     62CLASSPATH_IPK=$(BUILD_DIR)/classpath_$(CLASSPATH_VERSION)-$(CLASSPATH_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    156156# 
    157157$(CLASSPATH_IPK): $(CLASSPATH_BUILD_DIR)/.built 
    158         rm -rf $(CLASSPATH_IPK_DIR) $(BUILD_DIR)/classpath_*_armeb.ipk 
     158        rm -rf $(CLASSPATH_IPK_DIR) $(BUILD_DIR)/classpath_*_$(TARGET_ARCH).ipk 
    159159        $(MAKE) -C $(CLASSPATH_BUILD_DIR) install prefix=$(CLASSPATH_IPK_DIR)/opt 
    160160        $(MAKE) -C $(CLASSPATH_BUILD_DIR) install-strip prefix=$(CLASSPATH_IPK_DIR)/opt 
  • trunk/make/coreutils.mk

    r1033 r1327  
    5656COREUTILS_SOURCE_DIR=$(SOURCE_DIR)/coreutils 
    5757COREUTILS_IPK_DIR=$(BUILD_DIR)/coreutils-$(COREUTILS_VERSION)-ipk 
    58 COREUTILS_IPK=$(BUILD_DIR)/coreutils_$(COREUTILS_VERSION)-$(COREUTILS_IPK_VERSION)_armeb.ipk 
     58COREUTILS_IPK=$(BUILD_DIR)/coreutils_$(COREUTILS_VERSION)-$(COREUTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    149149# 
    150150$(COREUTILS_IPK): $(COREUTILS_BUILD_DIR)/.built 
    151         rm -rf $(COREUTILS_IPK_DIR) $(BUILD_DIR)/coreutils_*_armeb.ipk 
     151        rm -rf $(COREUTILS_IPK_DIR) $(BUILD_DIR)/coreutils_*_$(TARGET_ARCH).ipk 
    152152        # Install binaries 
    153153        install -d $(COREUTILS_IPK_DIR)/opt/bin 
  • trunk/make/cpio.mk

    r661 r1327  
    4040CPIO_SOURCE_DIR=$(SOURCE_DIR)/cpio 
    4141CPIO_IPK_DIR=$(BUILD_DIR)/cpio-$(CPIO_VERSION)-ipk 
    42 CPIO_IPK=$(BUILD_DIR)/cpio_$(CPIO_VERSION)-$(CPIO_IPK_VERSION)_armeb.ipk 
     42CPIO_IPK=$(BUILD_DIR)/cpio_$(CPIO_VERSION)-$(CPIO_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4343 
    4444# 
  • trunk/make/cron.mk

    r1144 r1327  
    6060CRON_SOURCE_DIR=$(SOURCE_DIR)/cron 
    6161CRON_IPK_DIR=$(BUILD_DIR)/cron-$(CRON_VERSION)-ipk 
    62 CRON_IPK=$(BUILD_DIR)/cron_$(CRON_VERSION)-$(CRON_IPK_VERSION)_armeb.ipk 
     62CRON_IPK=$(BUILD_DIR)/cron_$(CRON_VERSION)-$(CRON_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    138138# 
    139139$(CRON_IPK): $(CRON_BUILD_DIR)/.built 
    140         rm -rf $(CRON_IPK_DIR) $(BUILD_DIR)/cron_*_armeb.ipk 
     140        rm -rf $(CRON_IPK_DIR) $(BUILD_DIR)/cron_*_$(TARGET_ARCH).ipk 
    141141        # Install and strip the two executables 
    142142        install -d $(CRON_IPK_DIR)/opt/sbin 
  • trunk/make/crosstool-native.mk

    r1141 r1327  
    4141CROSSTOOL-NATIVE_LDFLAGS= 
    4242 
    43 CROSSTOOL-NATIVE_PREFIX=/opt/armeb 
     43CROSSTOOL-NATIVE_PREFIX=/opt/$(TARGET_ARCH) 
    4444 
    4545# 
     
    5555CROSSTOOL-NATIVE_SOURCE_DIR=$(SOURCE_DIR)/crosstool-native 
    5656CROSSTOOL-NATIVE_IPK_DIR=$(BUILD_DIR)/crosstool-native-$(CROSSTOOL-NATIVE_VERSION)-ipk 
    57 CROSSTOOL-NATIVE_IPK=$(BUILD_DIR)/crosstool-native_$(CROSSTOOL-NATIVE_VERSION)-$(CROSSTOOL-NATIVE_IPK_VERSION)_armeb.ipk 
     57CROSSTOOL-NATIVE_IPK=$(BUILD_DIR)/crosstool-native_$(CROSSTOOL-NATIVE_VERSION)-$(CROSSTOOL-NATIVE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    148148# 
    149149$(CROSSTOOL-NATIVE_IPK): $(CROSSTOOL-NATIVE_BUILD_DIR)/.built 
    150         rm -rf $(CROSSTOOL-NATIVE_IPK_DIR)* $(BUILD_DIR)/crosstool-native*_armeb.ipk 
     150        rm -rf $(CROSSTOOL-NATIVE_IPK_DIR)* $(BUILD_DIR)/crosstool-native*_$(TARGET_ARCH).ipk 
    151151        install -d $(CROSSTOOL-NATIVE_IPK_DIR)$(CROSSTOOL-NATIVE_PREFIX) 
    152152        ( cd $(CROSSTOOL-NATIVE_PREFIX) ; tar cf - . ) | \ 
  • trunk/make/crosstool.mk

    r768 r1327  
    5353CROSSTOOL_SOURCE_DIR=$(SOURCE_DIR)/crosstool 
    5454CROSSTOOL_IPK_DIR=$(BUILD_DIR)/crosstool-$(CROSSTOOL_VERSION)-ipk 
    55 CROSSTOOL_IPK=$(BUILD_DIR)/crosstool_$(CROSSTOOL_VERSION)-$(CROSSTOOL_IPK_VERSION)_armeb.ipk 
     55CROSSTOOL_IPK=$(BUILD_DIR)/crosstool_$(CROSSTOOL_VERSION)-$(CROSSTOOL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5656 
    5757# 
  • trunk/make/ctorrent.mk

    r1114 r1327  
    5656CTORRENT_SOURCE_DIR=$(SOURCE_DIR)/ctorrent 
    5757CTORRENT_IPK_DIR=$(BUILD_DIR)/ctorrent-$(CTORRENT_VERSION)-ipk 
    58 CTORRENT_IPK=$(BUILD_DIR)/ctorrent_$(CTORRENT_VERSION)-$(CTORRENT_IPK_VERSION)_armeb.ipk 
     58CTORRENT_IPK=$(BUILD_DIR)/ctorrent_$(CTORRENT_VERSION)-$(CTORRENT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/cups.mk

    r1284 r1327  
    6060CUPS_SOURCE_DIR=$(SOURCE_DIR)/cups 
    6161CUPS_IPK_DIR=$(BUILD_DIR)/cups-$(CUPS_VERSION)-ipk 
    62 CUPS_IPK=$(BUILD_DIR)/cups_$(CUPS_VERSION)-$(CUPS_IPK_VERSION)_armeb.ipk 
     62CUPS_IPK=$(BUILD_DIR)/cups_$(CUPS_VERSION)-$(CUPS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    169169# 
    170170$(CUPS_IPK): $(CUPS_BUILD_DIR)/.built 
    171         rm -rf $(CUPS_IPK_DIR) $(BUILD_DIR)/cups_*_armeb.ipk 
     171        rm -rf $(CUPS_IPK_DIR) $(BUILD_DIR)/cups_*_$(TARGET_ARCH).ipk 
    172172        install -d $(CUPS_IPK_DIR) 
    173173        # Make sure /opt/var/spool has correct permissions 
  • trunk/make/cvs.mk

    r1280 r1327  
    1515CVS_IPK_VERSION=1 
    1616 
    17 CVS_IPK=$(BUILD_DIR)/cvs_$(CVS_VERSION)-$(CVS_IPK_VERSION)_armeb.ipk 
     17CVS_IPK=$(BUILD_DIR)/cvs_$(CVS_VERSION)-$(CVS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1818CVS_IPK_DIR=$(BUILD_DIR)/cvs-$(CVS_VERSION)-ipk 
    1919 
     
    5252        mkdir -p $(CVS_IPK_DIR)/opt/bin 
    5353        $(STRIP_COMMAND) $(CVS_BUILD_DIR)/src/cvs -o $(CVS_IPK_DIR)/opt/bin/cvs 
    54         cp $(SOURCE_DIR)/cvs.control $(CVS_IPK_DIR)/CONTROL/control 
     54        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(CVS_VERSION)/" \ 
     55                -e "s/@RELEASE@/$(CVS_IPK_VERSION)/" cvs.control > $(CVS_IPK_DIR)/CONTROL/control 
    5556        cd $(BUILD_DIR); $(IPKG_BUILD) $(CVS_IPK_DIR) 
    5657 
  • trunk/make/cyrus-imapd.mk

    r1300 r1327  
    2424CYRUS-IMAPD_SOURCE_DIR=$(SOURCE_DIR)/cyrus-imapd 
    2525CYRUS-IMAPD_IPK_DIR=$(BUILD_DIR)/cyrus-imapd-$(CYRUS-IMAPD_VERSION)-ipk 
    26 CYRUS-IMAPD_IPK=$(BUILD_DIR)/cyrus-imapd_$(CYRUS-IMAPD_VERSION)-$(CYRUS-IMAPD_IPK_VERSION)_armeb.ipk 
     26CYRUS-IMAPD_IPK=$(BUILD_DIR)/cyrus-imapd_$(CYRUS-IMAPD_VERSION)-$(CYRUS-IMAPD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2727 
    2828$(DL_DIR)/$(CYRUS-IMAPD_SOURCE): 
     
    8181 
    8282$(CYRUS-IMAPD_IPK): $(CYRUS-IMAPD_BUILD_DIR)/.built 
    83         rm -rf $(CYRUS-IMAPD_IPK_DIR)* $(BUILD_DIR)/cyrus-imapd_*_armeb.ipk 
     83        rm -rf $(CYRUS-IMAPD_IPK_DIR)* $(BUILD_DIR)/cyrus-imapd_*_$(TARGET_ARCH).ipk 
    8484        install -d $(CYRUS-IMAPD_IPK_DIR)/opt/bin 
    8585        install -d $(CYRUS-IMAPD_IPK_DIR)/opt/etc 
  • trunk/make/cyrus-sasl.mk

    r1123 r1327  
    2020CYRUS-SASL_SOURCE_DIR=$(SOURCE_DIR)/cyrus-sasl 
    2121CYRUS-SASL_IPK_DIR=$(BUILD_DIR)/cyrus-sasl-$(CYRUS-SASL_VERSION)-ipk 
    22 CYRUS-SASL_IPK=$(BUILD_DIR)/cyrus-sasl_$(CYRUS-SASL_VERSION)-$(CYRUS-SASL_IPK_VERSION)_armeb.ipk 
     22CYRUS-SASL_IPK=$(BUILD_DIR)/cyrus-sasl_$(CYRUS-SASL_VERSION)-$(CYRUS-SASL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2323 
    2424$(DL_DIR)/$(CYRUS-SASL_SOURCE): 
     
    7575 
    7676$(CYRUS-SASL_IPK): $(CYRUS-SASL_BUILD_DIR)/.built 
    77         rm -rf $(CYRUS-SASL_IPK_DIR) $(BUILD_DIR)/cyrus-sasl_*_armeb.ipk 
     77        rm -rf $(CYRUS-SASL_IPK_DIR) $(BUILD_DIR)/cyrus-sasl_*_$(TARGET_ARCH).ipk 
    7878        $(MAKE) -C $(CYRUS-SASL_BUILD_DIR) DESTDIR=$(CYRUS-SASL_IPK_DIR) install 
    7979        find $(CYRUS-SASL_IPK_DIR) -type d -exec chmod go+rx {} \; 
  • trunk/make/dhcp.mk

    r1237 r1327  
    1414DHCP_UNZIP=zcat 
    1515DHCP_IPK_VERSION=1 
    16 DHCP_IPK=$(BUILD_DIR)/dhcp_$(DHCP_VERSION)-$(DHCP_IPK_VERSION)_armeb.ipk 
     16DHCP_IPK=$(BUILD_DIR)/dhcp_$(DHCP_VERSION)-$(DHCP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1717DHCP_IPK_DIR:=$(BUILD_DIR)/dhcp-$(DHCP_VERSION)-ipk 
    1818 
  • trunk/make/diffutils.mk

    r691 r1327  
    5050DIFFUTILS_SOURCE_DIR=$(SOURCE_DIR)/diffutils 
    5151DIFFUTILS_IPK_DIR=$(BUILD_DIR)/diffutils-$(DIFFUTILS_VERSION)-ipk 
    52 DIFFUTILS_IPK=$(BUILD_DIR)/diffutils_$(DIFFUTILS_VERSION)-$(DIFFUTILS_IPK_VERSION)_armeb.ipk 
     52DIFFUTILS_IPK=$(BUILD_DIR)/diffutils_$(DIFFUTILS_VERSION)-$(DIFFUTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5353 
    5454# 
     
    142142# 
    143143$(DIFFUTILS_IPK): $(DIFFUTILS_BUILD_DIR)/.built 
    144         rm -rf $(DIFFUTILS_IPK_DIR) $(BUILD_DIR)/diffutils_*_armeb.ipk 
     144        rm -rf $(DIFFUTILS_IPK_DIR) $(BUILD_DIR)/diffutils_*_$(TARGET_ARCH).ipk 
    145145        install -d $(DIFFUTILS_IPK_DIR)/opt/bin 
    146146        $(STRIP_COMMAND) $(DIFFUTILS_BUILD_DIR)/src/cmp -o $(DIFFUTILS_IPK_DIR)/opt/bin/cmp 
  • trunk/make/distcc.mk

    r661 r1327  
    5656DISTCC_SOURCE_DIR=$(SOURCE_DIR)/distcc 
    5757DISTCC_IPK_DIR=$(BUILD_DIR)/distcc-$(DISTCC_VERSION)-ipk 
    58 DISTCC_IPK=$(BUILD_DIR)/distcc_$(DISTCC_VERSION)-$(DISTCC_IPK_VERSION)_armeb.ipk 
     58DISTCC_IPK=$(BUILD_DIR)/distcc_$(DISTCC_VERSION)-$(DISTCC_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/dnsmasq.mk

    r792 r1327  
    1818DNSMASQ_SOURCE_DIR=$(SOURCE_DIR)/dnsmasq 
    1919DNSMASQ_IPK_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_VERSION)-ipk 
    20 DNSMASQ_IPK=$(BUILD_DIR)/dnsmasq_$(DNSMASQ_VERSION)-$(DNSMASQ_IPK_VERSION)_armeb.ipk 
     20DNSMASQ_IPK=$(BUILD_DIR)/dnsmasq_$(DNSMASQ_VERSION)-$(DNSMASQ_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(DNSMASQ_SOURCE): 
  • trunk/make/dropbear.mk

    r739 r1327  
    2424DROPBEAR_SOURCE_DIR=$(SOURCE_DIR)/dropbear 
    2525DROPBEAR_IPK_DIR=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION)-ipk 
    26 DROPBEAR_IPK=$(BUILD_DIR)/dropbear_$(DROPBEAR_VERSION)-1_armeb.ipk 
     26DROPBEAR_IPK=$(BUILD_DIR)/dropbear_$(DROPBEAR_VERSION)-1_$(TARGET_ARCH).ipk 
    2727 
    2828$(DL_DIR)/$(DROPBEAR_SOURCE): 
  • trunk/make/dump.mk

    r710 r1327  
    1313DUMP_UNZIP=zcat 
    1414 
    15 DUMP_IPK=$(BUILD_DIR)/dump_$(DUMP_VERSION)-1_armeb.ipk 
     15DUMP_IPK=$(BUILD_DIR)/dump_$(DUMP_VERSION)-1_$(TARGET_ARCH).ipk 
    1616DUMP_IPK_DIR=$(BUILD_DIR)/dump-$(DUMP_VERSION)-ipk 
    1717 
  • trunk/make/e2fsprogs.mk

    r1169 r1327  
    6060E2FSPROGS_SOURCE_DIR=$(SOURCE_DIR)/e2fsprogs 
    6161E2FSPROGS_IPK_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VERSION)-ipk 
    62 E2FSPROGS_IPK=$(BUILD_DIR)/e2fsprogs_$(E2FSPROGS_VERSION)-$(E2FSPROGS_IPK_VERSION)_armeb.ipk 
     62E2FSPROGS_IPK=$(BUILD_DIR)/e2fsprogs_$(E2FSPROGS_VERSION)-$(E2FSPROGS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    158158# 
    159159$(E2FSPROGS_IPK): $(E2FSPROGS_BUILD_DIR)/.built 
    160         rm -rf $(E2FSPROGS_IPK_DIR) $(BUILD_DIR)/e2fsprogs_*_armeb.ipk 
     160        rm -rf $(E2FSPROGS_IPK_DIR) $(BUILD_DIR)/e2fsprogs_*_$(TARGET_ARCH).ipk 
    161161#       $(MAKE) -C $(E2FSPROGS_BUILD_DIR) DESTDIR=$(E2FSPROGS_IPK_DIR) install 
    162162        # We place files in /opt/lib and /opt/sbin only 
  • trunk/make/ed.mk

    r869 r1327  
    5656ED_SOURCE_DIR=$(SOURCE_DIR)/ed 
    5757ED_IPK_DIR=$(BUILD_DIR)/ed-$(ED_VERSION)-ipk 
    58 ED_IPK=$(BUILD_DIR)/ed_$(ED_VERSION)-$(ED_IPK_VERSION)_armeb.ipk 
     58ED_IPK=$(BUILD_DIR)/ed_$(ED_VERSION)-$(ED_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    133133# 
    134134$(ED_IPK): $(ED_BUILD_DIR)/.built 
    135         rm -rf $(ED_IPK_DIR) $(BUILD_DIR)/ed_*_armeb.ipk 
     135        rm -rf $(ED_IPK_DIR) $(BUILD_DIR)/ed_*_$(TARGET_ARCH).ipk 
    136136        $(MAKE) -C $(ED_BUILD_DIR) prefix=$(ED_IPK_DIR)/opt install 
    137137        install -d $(ED_IPK_DIR)/CONTROL 
  • trunk/make/elinks.mk

    r1287 r1327  
    5656ELINKS_SOURCE_DIR=$(SOURCE_DIR)/elinks 
    5757ELINKS_IPK_DIR=$(BUILD_DIR)/elinks-$(ELINKS_VERSION)-ipk 
    58 ELINKS_IPK=$(BUILD_DIR)/elinks_$(ELINKS_VERSION)-$(ELINKS_IPK_VERSION)_armeb.ipk 
     58ELINKS_IPK=$(BUILD_DIR)/elinks_$(ELINKS_VERSION)-$(ELINKS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    146146# 
    147147$(ELINKS_IPK): $(ELINKS_BUILD_DIR)/.built 
    148         rm -rf $(ELINKS_IPK_DIR) $(BUILD_DIR)/elinks_*_armeb.ipk 
     148        rm -rf $(ELINKS_IPK_DIR) $(BUILD_DIR)/elinks_*_$(TARGET_ARCH).ipk 
    149149        $(MAKE) -C $(ELINKS_BUILD_DIR) DESTDIR=$(ELINKS_IPK_DIR) install 
    150150        install -d $(ELINKS_IPK_DIR)/CONTROL 
  • trunk/make/emacs.mk

    r1295 r1327  
    5555EMACS_SOURCE_DIR=$(SOURCE_DIR)/emacs 
    5656EMACS_IPK_DIR=$(BUILD_DIR)/emacs-$(EMACS_VERSION)-ipk 
    57 EMACS_IPK=$(BUILD_DIR)/emacs_$(EMACS_VERSION)-$(EMACS_IPK_VERSION)_armeb.ipk 
     57EMACS_IPK=$(BUILD_DIR)/emacs_$(EMACS_VERSION)-$(EMACS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    138138# 
    139139$(EMACS_IPK): $(EMACS_BUILD_DIR)/.built 
    140         rm -rf $(EMACS_IPK_DIR) $(BUILD_DIR)/emacs_*_armeb.ipk 
     140        rm -rf $(EMACS_IPK_DIR) $(BUILD_DIR)/emacs_*_$(TARGET_ARCH).ipk 
    141141        install -d $(EMACS_IPK_DIR)/opt 
    142142        $(MAKE) -C $(EMACS_BUILD_DIR) prefix=$(EMACS_IPK_DIR)/opt install TARGET_LIBDIR=$(TARGET_LIBDIR) 
  • trunk/make/espgs.mk

    r1290 r1327  
    6161ESPGS_SOURCE_DIR=$(SOURCE_DIR)/espgs 
    6262ESPGS_IPK_DIR=$(BUILD_DIR)/espgs-$(ESPGS_VERSION)-ipk 
    63 ESPGS_IPK=$(BUILD_DIR)/espgs_$(ESPGS_VERSION)-$(ESPGS_IPK_VERSION)_armeb.ipk 
     63ESPGS_IPK=$(BUILD_DIR)/espgs_$(ESPGS_VERSION)-$(ESPGS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    153153# 
    154154$(ESPGS_IPK): $(ESPGS_BUILD_DIR)/.built 
    155         rm -rf $(ESPGS_IPK_DIR) $(BUILD_DIR)/espgs_*_armeb.ipk 
     155        rm -rf $(ESPGS_IPK_DIR) $(BUILD_DIR)/espgs_*_$(TARGET_ARCH).ipk 
    156156        cat $(ESPGS_BUILD_DIR)/pstoraster/pstopxl.in | sed 's/@bindir@/\/opt\/bin/g' | sed 's/@prefix@/\/opt/g'| sed 's/@exec_prefix@/\/opt/g' |sed 's/@GS_VERSION_MAJOR@/8/g'|  sed 's/@GS_VERSION_MINOR@/15/g' |  sed 's/@GS_VERSION_PATCH@//g' |  sed 's/@GS@/gs/g' > $(ESPGS_BUILD_DIR)/pstoraster/pstopxl 
    157157        cat $(ESPGS_BUILD_DIR)/pstoraster/pstoraster.in | sed 's/@bindir@/\/opt\/bin/g' | sed 's/@prefix@/\/opt/g'| sed 's/@exec_prefix@/\/opt/g' |sed 's/@GS_VERSION_MAJOR@/8/g'|  sed 's/@GS_VERSION_MINOR@/15/g' |  sed 's/@GS_VERSION_PATCH@//g' |  sed 's/@GS@/gs/g' > $(ESPGS_BUILD_DIR)/pstoraster/pstoraster 
  • trunk/make/expat.mk

    r830 r1327  
    5555EXPAT_SOURCE_DIR=$(SOURCE_DIR)/expat 
    5656EXPAT_IPK_DIR=$(BUILD_DIR)/expat-$(EXPAT_VERSION)-ipk 
    57 EXPAT_IPK=$(BUILD_DIR)/expat_$(EXPAT_VERSION)-$(EXPAT_IPK_VERSION)_armeb.ipk 
     57EXPAT_IPK=$(BUILD_DIR)/expat_$(EXPAT_VERSION)-$(EXPAT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    149149# 
    150150$(EXPAT_IPK): $(EXPAT_BUILD_DIR)/.built 
    151         rm -rf $(EXPAT_IPK_DIR) $(BUILD_DIR)/expat_*_armeb.ipk 
     151        rm -rf $(EXPAT_IPK_DIR) $(BUILD_DIR)/expat_*_$(TARGET_ARCH).ipk 
    152152        install -d $(EXPAT_IPK_DIR)/opt/lib $(EXPAT_IPK_DIR)/opt/include 
    153153        (cd $(EXPAT_BUILD_DIR); \ 
  • trunk/make/fetchmail.mk

    r963 r1327  
    6161FETCHMAIL_SOURCE_DIR=$(SOURCE_DIR)/fetchmail 
    6262FETCHMAIL_IPK_DIR=$(BUILD_DIR)/fetchmail-$(FETCHMAIL_VERSION)-ipk 
    63 FETCHMAIL_IPK=$(BUILD_DIR)/fetchmail_$(FETCHMAIL_VERSION)-$(FETCHMAIL_IPK_VERSION)_armeb.ipk 
     63FETCHMAIL_IPK=$(BUILD_DIR)/fetchmail_$(FETCHMAIL_VERSION)-$(FETCHMAIL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    155155# 
    156156$(FETCHMAIL_IPK): $(FETCHMAIL_BUILD_DIR)/.built 
    157         rm -rf $(FETCHMAIL_IPK_DIR) $(BUILD_DIR)/fetchmail_*_armeb.ipk 
     157        rm -rf $(FETCHMAIL_IPK_DIR) $(BUILD_DIR)/fetchmail_*_$(TARGET_ARCH).ipk 
    158158        $(MAKE) -C $(FETCHMAIL_BUILD_DIR) DESTDIR=$(FETCHMAIL_IPK_DIR) install 
    159159        find $(FETCHMAIL_IPK_DIR) -type d -exec chmod go+rx {} \; 
  • trunk/make/ffmpeg.mk

    r1220 r1327  
    6060FFMPEG_SOURCE_DIR=$(SOURCE_DIR)/ffmpeg 
    6161FFMPEG_IPK_DIR=$(BUILD_DIR)/ffmpeg-$(FFMPEG_VERSION)-ipk 
    62 FFMPEG_IPK=$(BUILD_DIR)/ffmpeg_$(FFMPEG_VERSION)-$(FFMPEG_IPK_VERSION)_armeb.ipk 
     62FFMPEG_IPK=$(BUILD_DIR)/ffmpeg_$(FFMPEG_VERSION)-$(FFMPEG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    151151# 
    152152$(FFMPEG_IPK): $(FFMPEG_BUILD_DIR)/.built 
    153         rm -rf $(FFMPEG_IPK_DIR) $(BUILD_DIR)/ffmpeg_*_armeb.ipk 
     153        rm -rf $(FFMPEG_IPK_DIR) $(BUILD_DIR)/ffmpeg_*_$(TARGET_ARCH).ipk 
    154154        $(MAKE) -C $(FFMPEG_BUILD_DIR) mandir=$(FFMPEG_IPK_DIR)/opt/man bindir=$(FFMPEG_IPK_DIR)/opt/bin prefix=$(FFMPEG_IPK_DIR)/opt DESTDIR=$(FFMPEG_IPK_DIR) install 
    155155        install -d $(FFMPEG_IPK_DIR)/CONTROL 
  • trunk/make/file.mk

    r678 r1327  
    5656FILE_SOURCE_DIR=$(SOURCE_DIR)/file 
    5757FILE_IPK_DIR=$(BUILD_DIR)/file-$(FILE_VERSION)-ipk 
    58 FILE_IPK=$(BUILD_DIR)/file_$(FILE_VERSION)-$(FILE_IPK_VERSION)_armeb.ipk 
     58FILE_IPK=$(BUILD_DIR)/file_$(FILE_VERSION)-$(FILE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    137137# 
    138138$(FILE_IPK): $(FILE_BUILD_DIR)/.built 
    139         rm -rf $(FILE_IPK_DIR) $(BUILD_DIR)/file_*_armeb.ipk 
     139        rm -rf $(FILE_IPK_DIR) $(BUILD_DIR)/file_*_$(TARGET_ARCH).ipk 
    140140        install -d $(FILE_IPK_DIR)/opt/bin 
    141141        $(MAKE) -C $(FILE_BUILD_DIR) DESTDIR=$(FILE_IPK_DIR) SUBDIRS=src install 
  • trunk/make/findutils.mk

    r741 r1327  
    4040FINDUTILS_SOURCE_DIR=$(SOURCE_DIR)/findutils 
    4141FINDUTILS_IPK_DIR=$(BUILD_DIR)/findutils-$(FINDUTILS_VERSION)-ipk 
    42 FINDUTILS_IPK=$(BUILD_DIR)/findutils_$(FINDUTILS_VERSION)-$(FINDUTILS_IPK_VERSION)_armeb.ipk 
     42FINDUTILS_IPK=$(BUILD_DIR)/findutils_$(FINDUTILS_VERSION)-$(FINDUTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4343FINDUTILS_DOC_IPK_DIR=$(BUILD_DIR)/findutils-doc-$(FINDUTILS_VERSION)-ipk 
    44 FINDUTILS_DOC_IPK=$(BUILD_DIR)/findutils-doc_$(FINDUTILS_VERSION)-$(FINDUTILS_IPK_VERSION)_armeb.ipk 
     44FINDUTILS_DOC_IPK=$(BUILD_DIR)/findutils-doc_$(FINDUTILS_VERSION)-$(FINDUTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4545 
    4646# 
     
    124124# 
    125125$(FINDUTILS_IPK): $(FINDUTILS_BUILD_DIR)/.built 
    126         rm -rf $(FINDUTILS_IPK_DIR) $(BUILD_DIR)/findutils_*_armeb.ipk 
     126        rm -rf $(FINDUTILS_IPK_DIR) $(BUILD_DIR)/findutils_*_$(TARGET_ARCH).ipk 
    127127        install -d $(FINDUTILS_IPK_DIR)/opt/bin 
    128128        $(STRIP_COMMAND) $(FINDUTILS_BUILD_DIR)/find/find -o $(FINDUTILS_IPK_DIR)/opt/bin/find 
     
    133133 
    134134$(FINDUTILS_DOC_IPK): $(FINDUTILS_BUILD_DIR)/.built 
    135         rm -rf $(FINDUTILS_DOC_IPK_DIR) $(BUILD_DIR)/findutils-doc_*_armeb.ipk 
     135        rm -rf $(FINDUTILS_DOC_IPK_DIR) $(BUILD_DIR)/findutils-doc_*_$(TARGET_ARCH).ipk 
    136136        install -d $(FINDUTILS_DOC_IPK_DIR)/opt/doc/findutils 
    137137        install -m 644 $(FINDUTILS_BUILD_DIR)/doc/find.i* $(FINDUTILS_DOC_IPK_DIR)/opt/doc/findutils 
  • trunk/make/fixesext.mk

    r1138 r1327  
    5656FIXESEXT_SOURCE_DIR=$(SOURCE_DIR)/fixesext 
    5757FIXESEXT_IPK_DIR=$(BUILD_DIR)/fixesext-$(FIXESEXT_VERSION)-ipk 
    58 FIXESEXT_IPK=$(BUILD_DIR)/fixesext_$(FIXESEXT_VERSION)-$(FIXESEXT_IPK_VERSION)_armeb.ipk 
     58FIXESEXT_IPK=$(BUILD_DIR)/fixesext_$(FIXESEXT_VERSION)-$(FIXESEXT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    6565        @rm -f $@ 
    6666        @echo "Package: fixesext" >>$@ 
    67         @echo "Architecture: armeb" >>$@ 
     67        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    6868        @echo "Priority: $(FIXESEXT_PRIORITY)" >>$@ 
    6969        @echo "Section: $(FIXESEXT_SECTION)" >>$@ 
     
    153153# 
    154154$(FIXESEXT_IPK): $(FIXESEXT_BUILD_DIR)/.built 
    155         rm -rf $(FIXESEXT_IPK_DIR) $(BUILD_DIR)/fixesext_*_armeb.ipk 
     155        rm -rf $(FIXESEXT_IPK_DIR) $(BUILD_DIR)/fixesext_*_$(TARGET_ARCH).ipk 
    156156        $(MAKE) -C $(FIXESEXT_BUILD_DIR) DESTDIR=$(FIXESEXT_IPK_DIR) install 
    157157        $(MAKE) $(FIXESEXT_IPK_DIR)/CONTROL/control 
  • trunk/make/flac.mk

    r1321 r1327  
    6060FLAC_SOURCE_DIR=$(SOURCE_DIR)/flac 
    6161FLAC_IPK_DIR=$(BUILD_DIR)/flac-$(FLAC_VERSION)-ipk 
    62 FLAC_IPK=$(BUILD_DIR)/flac_$(FLAC_VERSION)-$(FLAC_IPK_VERSION)_armeb.ipk 
     62FLAC_IPK=$(BUILD_DIR)/flac_$(FLAC_VERSION)-$(FLAC_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    150150# 
    151151$(FLAC_IPK): $(FLAC_BUILD_DIR)/.built 
    152         rm -rf $(FLAC_IPK_DIR) $(BUILD_DIR)/flac_*_armeb.ipk 
     152        rm -rf $(FLAC_IPK_DIR) $(BUILD_DIR)/flac_*_$(TARGET_ARCH).ipk 
    153153        $(MAKE) -C $(FLAC_BUILD_DIR) DESTDIR=$(FLAC_IPK_DIR) install 
    154154        #[JEC]install -d $(FLAC_IPK_DIR)/opt/etc/ 
  • trunk/make/flex.mk

    r283 r1327  
    1717FLEX_SOURCE_DIR=$(SOURCE_DIR)/flex 
    1818FLEX_IPK_DIR=$(BUILD_DIR)/flex-$(FLEX_VERSION)-ipk 
    19 FLEX_IPK=$(BUILD_DIR)/flex_$(FLEX_VERSION)-$(FLEX_IPK_VERSION)_armeb.ipk 
     19FLEX_IPK=$(BUILD_DIR)/flex_$(FLEX_VERSION)-$(FLEX_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2020 
    2121$(DL_DIR)/$(FLEX_SOURCE): 
  • trunk/make/fontconfig.mk

    r1275 r1327  
    5757FONTCONFIG_SOURCE_DIR=$(SOURCE_DIR)/fontconfig 
    5858FONTCONFIG_IPK_DIR=$(BUILD_DIR)/fontconfig-$(FONTCONFIG_VERSION)-ipk 
    59 FONTCONFIG_IPK=$(BUILD_DIR)/fontconfig_$(FONTCONFIG_VERSION)-$(FONTCONFIG_IPK_VERSION)_armeb.ipk 
     59FONTCONFIG_IPK=$(BUILD_DIR)/fontconfig_$(FONTCONFIG_VERSION)-$(FONTCONFIG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6060 
    6161# 
     
    6666        @rm -f $@ 
    6767        @echo "Package: fontconfig" >>$@ 
    68         @echo "Architecture: armeb" >>$@ 
     68        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    6969        @echo "Priority: $(FONTCONFIG_PRIORITY)" >>$@ 
    7070        @echo "Section: $(FONTCONFIG_SECTION)" >>$@ 
     
    159159# 
    160160$(FONTCONFIG_IPK): $(FONTCONFIG_BUILD_DIR)/.built 
    161         rm -rf $(FONTCONFIG_IPK_DIR) $(BUILD_DIR)/fontconfig_*_armeb.ipk 
     161        rm -rf $(FONTCONFIG_IPK_DIR) $(BUILD_DIR)/fontconfig_*_$(TARGET_ARCH).ipk 
    162162        $(MAKE) -C $(FONTCONFIG_BUILD_DIR) DESTDIR=$(FONTCONFIG_IPK_DIR) install-strip 
    163163        rm -f $(FONTCONFIG_IPK_DIR)/opt/lib/*.la 
  • trunk/make/freeradius.mk

    r769 r1327  
    2121# 
    2222FREERADIUS_SITE=ftp://www.freeradius.org/pub/radius 
    23 FREERADIUS_VERSION=1.0.1 
     23FREERADIUS_VERSION=1.0.2 
    2424FREERADIUS_SOURCE=freeradius-$(FREERADIUS_VERSION).tar.gz 
    2525FREERADIUS_DIR=freeradius-$(FREERADIUS_VERSION) 
     
    2929# FREERADIUS_IPK_VERSION should be incremented when the ipk changes. 
    3030# 
    31 FREERADIUS_IPK_VERSION=2 
     31FREERADIUS_IPK_VERSION=1 
    3232 
    3333# 
     
    5757FREERADIUS_IPK_DIR=$(BUILD_DIR)/freeradius-$(FREERADIUS_VERSION)-ipk 
    5858FREERADIUS_DOC_IPK_DIR=$(BUILD_DIR)/freeradius-doc-$(FREERADIUS_VERSION)-ipk 
    59 FREERADIUS_IPK=$(BUILD_DIR)/freeradius_$(FREERADIUS_VERSION)-$(FREERADIUS_IPK_VERSION)_armeb.ipk 
    60 FREERADIUS_DOC_IPK=$(BUILD_DIR)/freeradius-doc_$(FREERADIUS_VERSION)-$(FREERADIUS_IPK_VERSION)_armeb.ipk 
     59FREERADIUS_IPK=$(BUILD_DIR)/freeradius_$(FREERADIUS_VERSION)-$(FREERADIUS_IPK_VERSION)_$(TARGET_ARCH).ipk 
     60FREERADIUS_DOC_IPK=$(BUILD_DIR)/freeradius-doc_$(FREERADIUS_VERSION)-$(FREERADIUS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6161FREERADIUS_RLMCFLAGS="${STAGING_CPPFLAGS} -I${FREERADIUS_BUILD_DIR}/src/include -I../rlm_eap_tls -I${FREERADIUS_BUILD_DIR}/src/modules/rlm_eap -I${FREERADIUS_BUILD_DIR}/src/modules/rlm_eap/libeap/ -DX99_MODULE_NAME=\"rlm_x99_token\"  -DFREERADIUS" 
    6262# 
     
    176176        install -m 755 $(FREERADIUS_SOURCE_DIR)/rc.freeradius $(FREERADIUS_IPK_DIR)/opt/etc/init.d/S55freeradius 
    177177        install -d $(FREERADIUS_IPK_DIR)/CONTROL 
    178         install -m 644 $(FREERADIUS_SOURCE_DIR)/control $(FREERADIUS_IPK_DIR)/CONTROL/control 
     178        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(FREERADIUS_VERSION)/" \ 
     179                -e "s/@RELEASE@/$(FREERADIUS_IPK_VERSION)/" $(FREERADIUS_SOURCE_DIR)/control > $(FREERADIUS_IPK_DIR)/CONTROL/control 
    179180        install -m 644 $(FREERADIUS_SOURCE_DIR)/postinst $(FREERADIUS_IPK_DIR)/CONTROL/postinst 
    180181        install -m 644 $(FREERADIUS_SOURCE_DIR)/prerm $(FREERADIUS_IPK_DIR)/CONTROL/prerm 
     
    188189        cp -rf $(FREERADIUS_BUILD_DIR)/install/opt/share/doc/* $(FREERADIUS_DOC_IPK_DIR)/opt/doc/ 
    189190        install -d $(FREERADIUS_DOC_IPK_DIR)/CONTROL 
    190         install -m 644 $(FREERADIUS_SOURCE_DIR)/control.doc $(FREERADIUS_DOC_IPK_DIR)/CONTROL/control 
     191        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(FREERADIUS_VERSION)/" \ 
     192                -e "s/@RELEASE@/$(FREERADIUS_IPK_VERSION)/" $(FREERADIUS_SOURCE_DIR)/control.doc > $(FREERADIUS_DOC_IPK_DIR)/CONTROL/control 
    191193        cd $(BUILD_DIR); $(IPKG_BUILD) $(FREERADIUS_DOC_IPK_DIR) 
    192194 
  • trunk/make/freetype.mk

    r1319 r1327  
    6565FREETYPE_SOURCE_DIR=$(SOURCE_DIR)/freetype 
    6666FREETYPE_IPK_DIR=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION)-ipk 
    67 FREETYPE_IPK=$(BUILD_DIR)/freetype_$(FREETYPE_VERSION)-$(FREETYPE_IPK_VERSION)_armeb.ipk 
     67FREETYPE_IPK=$(BUILD_DIR)/freetype_$(FREETYPE_VERSION)-$(FREETYPE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6868 
    6969# 
     
    7474        @rm -f $@ 
    7575        @echo "Package: freetype" >>$@ 
    76         @echo "Architecture: armeb" >>$@ 
     76        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7777        @echo "Priority: $(FREETYPE_PRIORITY)" >>$@ 
    7878        @echo "Section: $(FREETYPE_SECTION)" >>$@ 
     
    172172# 
    173173$(FREETYPE_IPK): $(FREETYPE_BUILD_DIR)/.built 
    174         rm -rf $(FREETYPE_IPK_DIR) $(BUILD_DIR)/freetype_*_armeb.ipk 
     174        rm -rf $(FREETYPE_IPK_DIR) $(BUILD_DIR)/freetype_*_$(TARGET_ARCH).ipk 
    175175        $(MAKE) -C $(FREETYPE_BUILD_DIR) DESTDIR=$(FREETYPE_IPK_DIR) install 
    176176        rm -f $(FREETYPE_IPK_DIR)/opt/lib/*.la 
  • trunk/make/gawk.mk

    r701 r1327  
    5656GAWK_SOURCE_DIR=$(SOURCE_DIR)/gawk 
    5757GAWK_IPK_DIR=$(BUILD_DIR)/gawk-$(GAWK_VERSION)-ipk 
    58 GAWK_IPK=$(BUILD_DIR)/gawk_$(GAWK_VERSION)-$(GAWK_IPK_VERSION)_armeb.ipk 
     58GAWK_IPK=$(BUILD_DIR)/gawk_$(GAWK_VERSION)-$(GAWK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    153153# 
    154154$(GAWK_IPK): $(GAWK_BUILD_DIR)/.built 
    155         rm -rf $(GAWK_IPK_DIR) $(BUILD_DIR)/gawk_*_armeb.ipk 
     155        rm -rf $(GAWK_IPK_DIR) $(BUILD_DIR)/gawk_*_$(TARGET_ARCH).ipk 
    156156        install -d $(GAWK_IPK_DIR)/opt/bin 
    157157        $(MAKE) -C $(GAWK_BUILD_DIR) DESTDIR=$(GAWK_IPK_DIR) install 
  • trunk/make/gconv-modules.mk

    r1322 r1327  
    1313GCONV_MODULES_SOURCE_DIR=$(SOURCE_DIR)/gconv-modules 
    1414GCONV_MODULES_IPK_DIR=$(BUILD_DIR)/gconv-modules-$(GCONV_MODULES_VERSION)-ipk 
    15 GCONV_MODULES_IPK=$(BUILD_DIR)/gconv-modules_$(GCONV_MODULES_VERSION)-$(GCONV_MODULES_IPK_VERSION)_armeb.ipk 
     15GCONV_MODULES_IPK=$(BUILD_DIR)/gconv-modules_$(GCONV_MODULES_VERSION)-$(GCONV_MODULES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1616 
    1717$(GCONV_MODULES_BUILD_DIR)/.configured: $(GCONV_MODULES_PATCHES) 
     
    3535 
    3636$(GCONV_MODULES_IPK): $(GCONV_MODULES_BUILD_DIR)/.built 
    37         rm -rf $(GCONV_MODULES_IPK_DIR) $(BUILD_DIR)/gconv-modules_*_armeb.ipk 
     37        rm -rf $(GCONV_MODULES_IPK_DIR) $(BUILD_DIR)/gconv-modules_*_$(TARGET_ARCH).ipk 
    3838        install -d $(GCONV_MODULES_IPK_DIR)/opt/lib/gconv 
    3939        cp $(TARGET_LIBDIR)/gconv/* $(GCONV_MODULES_IPK_DIR)/opt/lib/gconv 
  • trunk/make/gdb.mk

    r1133 r1327  
    6262GDB_SOURCE_DIR=$(SOURCE_DIR)/gdb 
    6363GDB_IPK_DIR=$(BUILD_DIR)/gdb-$(GDB_VERSION)-ipk 
    64 GDB_IPK=$(BUILD_DIR)/gdb_$(GDB_VERSION)-$(GDB_IPK_VERSION)_armeb.ipk 
     64GDB_IPK=$(BUILD_DIR)/gdb_$(GDB_VERSION)-$(GDB_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6565 
    6666# 
     
    184184$(GDB_IPK): $(GDB_BUILD_DIR)/.built 
    185185        ls -la $(GDB_BUILD_DIR)/.built 
    186         rm -rf $(GDB_IPK_DIR) $(BUILD_DIR)/gdb_*_armeb.ipk 
     186        rm -rf $(GDB_IPK_DIR) $(BUILD_DIR)/gdb_*_$(TARGET_ARCH).ipk 
    187187        $(MAKE) -C $(GDB_BUILD_DIR) prefix=$(GDB_IPK_DIR)/opt install 
    188188        rm -f $(GDB_IPK_DIR)/opt/info/standards.info 
  • trunk/make/gdbm.mk

    r739 r1327  
    1818GDBM_BUILD_DIR=$(BUILD_DIR)/gdbm 
    1919GDBM_SOURCE_DIR=$(SOURCE_DIR)/gdbm 
    20 GDBM_IPK=$(BUILD_DIR)/gdbm_$(GDBM_VERSION)-$(GDBM_IPK_VERSION)_armeb.ipk 
     20GDBM_IPK=$(BUILD_DIR)/gdbm_$(GDBM_VERSION)-$(GDBM_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121GDBM_IPK_DIR=$(BUILD_DIR)/gdbm-$(GDBM_VERSION)-ipk 
    2222 
  • trunk/make/gettext.mk

    r890 r1327  
    5555GETTEXT_SOURCE_DIR=$(SOURCE_DIR)/gettext 
    5656GETTEXT_IPK_DIR=$(BUILD_DIR)/gettext-$(GETTEXT_VERSION)-ipk 
    57 GETTEXT_IPK=$(BUILD_DIR)/gettext_$(GETTEXT_VERSION)-$(GETTEXT_IPK_VERSION)_armeb.ipk 
     57GETTEXT_IPK=$(BUILD_DIR)/gettext_$(GETTEXT_VERSION)-$(GETTEXT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    143143# 
    144144$(GETTEXT_IPK): $(GETTEXT_BUILD_DIR)/.built 
    145         rm -rf $(GETTEXT_IPK_DIR) $(BUILD_DIR)/gettext_*_armeb.ipk 
     145        rm -rf $(GETTEXT_IPK_DIR) $(BUILD_DIR)/gettext_*_$(TARGET_ARCH).ipk 
    146146        $(MAKE) -C $(GETTEXT_BUILD_DIR) DESTDIR=$(GETTEXT_IPK_DIR) install 
    147147#       install -d $(GETTEXT_IPK_DIR)/opt/etc/ 
  • trunk/make/ghostscript.mk

    r1250 r1327  
    6060GHOSTSCRIPT_SOURCE_DIR=$(SOURCE_DIR)/ghostscript 
    6161GHOSTSCRIPT_IPK_DIR=$(BUILD_DIR)/ghostscript-$(GHOSTSCRIPT_VERSION)-ipk 
    62 GHOSTSCRIPT_IPK=$(BUILD_DIR)/ghostscript_$(GHOSTSCRIPT_VERSION)-$(GHOSTSCRIPT_IPK_VERSION)_armeb.ipk 
     62GHOSTSCRIPT_IPK=$(BUILD_DIR)/ghostscript_$(GHOSTSCRIPT_VERSION)-$(GHOSTSCRIPT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    150150# 
    151151$(GHOSTSCRIPT_IPK): $(GHOSTSCRIPT_BUILD_DIR)/.built 
    152         rm -rf $(GHOSTSCRIPT_IPK_DIR) $(BUILD_DIR)/ghostscript_*_armeb.ipk 
     152        rm -rf $(GHOSTSCRIPT_IPK_DIR) $(BUILD_DIR)/ghostscript_*_$(TARGET_ARCH).ipk 
    153153        $(MAKE) -C $(GHOSTSCRIPT_BUILD_DIR) prefix=$(GHOSTSCRIPT_IPK_DIR)/opt DESTDIR=$(GHOSTSCRIPT_IPK_DIR) install 
    154154        install -d $(GHOSTSCRIPT_IPK_DIR)/CONTROL 
  • trunk/make/gift-ares.mk

    r1122 r1327  
    6363GIFTARES_SOURCE_DIR=$(SOURCE_DIR)/gift-ares 
    6464GIFTARES_IPK_DIR=$(BUILD_DIR)/gift-ares-$(GIFTARES_VERSION)-ipk 
    65 GIFTARES_IPK=$(BUILD_DIR)/gift-ares_$(GIFTARES_VERSION)-$(GIFTARES_IPK_VERSION)_armeb.ipk 
     65GIFTARES_IPK=$(BUILD_DIR)/gift-ares_$(GIFTARES_VERSION)-$(GIFTARES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    168168# 
    169169$(GIFTARES_IPK): $(GIFTARES_BUILD_DIR)/.built 
    170         rm -rf $(GIFTARES_IPK_DIR) $(BUILD_DIR)/gift-ares_*_armeb.ipk 
     170        rm -rf $(GIFTARES_IPK_DIR) $(BUILD_DIR)/gift-ares_*_$(TARGET_ARCH).ipk 
    171171        install -d $(GIFTARES_IPK_DIR)/opt/lib/giFT 
    172172        $(STRIP_COMMAND) $(GIFTARES_BUILD_DIR)/gift/.libs/libAres.so -o $(GIFTARES_IPK_DIR)/opt/lib/giFT/libAres.so 
  • trunk/make/gift-fasttrack.mk

    r797 r1327  
    6161GIFTFASTTRACK_SOURCE_DIR=$(SOURCE_DIR)/gift-fasttrack 
    6262GIFTFASTTRACK_IPK_DIR=$(BUILD_DIR)/gift-fasttrack-$(GIFTFASTTRACK_VERSION)-ipk 
    63 GIFTFASTTRACK_IPK=$(BUILD_DIR)/gift-fasttrack_$(GIFTFASTTRACK_VERSION)-$(GIFTFASTTRACK_IPK_VERSION)_armeb.ipk 
     63GIFTFASTTRACK_IPK=$(BUILD_DIR)/gift-fasttrack_$(GIFTFASTTRACK_VERSION)-$(GIFTFASTTRACK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    151151# 
    152152$(GIFTFASTTRACK_IPK): $(GIFTFASTTRACK_BUILD_DIR)/.built 
    153         rm -rf $(GIFTFASTTRACK_IPK_DIR) $(BUILD_DIR)/gift-fasttrack_*_armeb.ipk 
     153        rm -rf $(GIFTFASTTRACK_IPK_DIR) $(BUILD_DIR)/gift-fasttrack_*_$(TARGET_ARCH).ipk 
    154154        install -d $(GIFTFASTTRACK_IPK_DIR)/opt/lib/giFT 
    155155        $(STRIP_COMMAND) $(GIFTFASTTRACK_BUILD_DIR)/src/.libs/libFastTrack.so -o $(GIFTFASTTRACK_IPK_DIR)/opt/lib/giFT/libFastTrack.so 
  • trunk/make/gift-gnutella.mk

    r824 r1327  
    6060GIFTGNUTELLA_SOURCE_DIR=$(SOURCE_DIR)/gift-gnutella 
    6161GIFTGNUTELLA_IPK_DIR=$(BUILD_DIR)/gift-gnutella-$(GIFTGNUTELLA_VERSION)-ipk 
    62 GIFTGNUTELLA_IPK=$(BUILD_DIR)/gift-gnutella_$(GIFTGNUTELLA_VERSION)-$(GIFTGNUTELLA_IPK_VERSION)_armeb.ipk 
     62GIFTGNUTELLA_IPK=$(BUILD_DIR)/gift-gnutella_$(GIFTGNUTELLA_VERSION)-$(GIFTGNUTELLA_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    156156# 
    157157$(GIFTGNUTELLA_IPK): $(GIFTGNUTELLA_BUILD_DIR)/.built 
    158         rm -rf $(GIFTGNUTELLA_IPK_DIR) $(BUILD_DIR)/gift-gnutella_*_armeb.ipk 
     158        rm -rf $(GIFTGNUTELLA_IPK_DIR) $(BUILD_DIR)/gift-gnutella_*_$(TARGET_ARCH).ipk 
    159159        install -d $(GIFTGNUTELLA_IPK_DIR)/opt/lib/giFT 
    160160        $(STRIP_COMMAND) $(GIFTGNUTELLA_BUILD_DIR)/src/.libs/libGnutella.so -o $(GIFTGNUTELLA_IPK_DIR)/opt/lib/giFT/libGnutella.so 
  • trunk/make/gift-openft.mk

    r824 r1327  
    5959GIFTOPENFT_SOURCE_DIR=$(SOURCE_DIR)/gift-openft 
    6060GIFTOPENFT_IPK_DIR=$(BUILD_DIR)/gift-openft-$(GIFTOPENFT_VERSION)-ipk 
    61 GIFTOPENFT_IPK=$(BUILD_DIR)/gift-openft_$(GIFTOPENFT_VERSION)-$(GIFTOPENFT_IPK_VERSION)_armeb.ipk 
     61GIFTOPENFT_IPK=$(BUILD_DIR)/gift-openft_$(GIFTOPENFT_VERSION)-$(GIFTOPENFT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6262 
    6363# 
     
    156156# 
    157157$(GIFTOPENFT_IPK): $(GIFTOPENFT_BUILD_DIR)/.built 
    158         rm -rf $(GIFTOPENFT_IPK_DIR) $(BUILD_DIR)/gift-openft_*_armeb.ipk 
     158        rm -rf $(GIFTOPENFT_IPK_DIR) $(BUILD_DIR)/gift-openft_*_$(TARGET_ARCH).ipk 
    159159        install -d $(GIFTOPENFT_IPK_DIR)/opt/lib/giFT 
    160160        $(STRIP_COMMAND) $(GIFTOPENFT_BUILD_DIR)/src/.libs/libOpenFT.so -o $(GIFTOPENFT_IPK_DIR)/opt/lib/giFT/libOpenFT.so 
  • trunk/make/gift-opennap.mk

    r1164 r1327  
    5353GIFT_OPENNAP_SOURCE_DIR=$(SOURCE_DIR)/gift-opennap 
    5454GIFT_OPENNAP_IPK_DIR=$(BUILD_DIR)/gift-opennap-$(GIFT_OPENNAP_VERSION)-ipk 
    55 GIFT_OPENNAP_IPK=$(BUILD_DIR)/gift-opennap_$(GIFT_OPENNAP_VERSION)-$(GIFT_OPENNAP_IPK_VERSION)_armeb.ipk 
     55GIFT_OPENNAP_IPK=$(BUILD_DIR)/gift-opennap_$(GIFT_OPENNAP_VERSION)-$(GIFT_OPENNAP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5656 
    5757# 
     
    154154# 
    155155$(GIFT_OPENNAP_IPK): $(GIFT_OPENNAP_BUILD_DIR)/.built 
    156         rm -rf $(GIFT_OPENNAP_IPK_DIR) $(BUILD_DIR)/gift-opennap_*_armeb.ipk 
     156        rm -rf $(GIFT_OPENNAP_IPK_DIR) $(BUILD_DIR)/gift-opennap_*_$(TARGET_ARCH).ipk 
    157157        install -d $(GIFT_OPENNAP_IPK_DIR)/opt/lib/giFT 
    158158        $(STRIP_COMMAND) $(GIFT_OPENNAP_BUILD_DIR)/src/.libs/libOpenNap.so -o $(GIFT_OPENNAP_IPK_DIR)/opt/lib/giFT/libOpenNap.so 
  • trunk/make/gift.mk

    r1320 r1327  
    6161GIFT_SOURCE_DIR=$(SOURCE_DIR)/gift 
    6262GIFT_IPK_DIR=$(BUILD_DIR)/gift-$(GIFT_VERSION)-ipk 
    63 GIFT_IPK=$(BUILD_DIR)/gift_$(GIFT_VERSION)-$(GIFT_IPK_VERSION)_armeb.ipk 
     63GIFT_IPK=$(BUILD_DIR)/gift_$(GIFT_VERSION)-$(GIFT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    148148# 
    149149$(GIFT_IPK): $(GIFT_BUILD_DIR)/.built 
    150         rm -rf $(GIFT_IPK_DIR) $(BUILD_DIR)/gift_*_armeb.ipk 
     150        rm -rf $(GIFT_IPK_DIR) $(BUILD_DIR)/gift_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(GIFT_BUILD_DIR) DESTDIR=$(GIFT_IPK_DIR) install-strip 
    152152        install -d $(GIFT_IPK_DIR)/CONTROL 
    153         install -m 644 $(GIFT_SOURCE_DIR)/control $(GIFT_IPK_DIR)/CONTROL/control 
     153        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(GIFT_VERSION)/" \ 
     154                -e "s/@RELEASE@/$(GIFT_IPK_VERSION)/" $(GIFT_SOURCE_DIR)/control > $(GIFT_IPK_DIR)/CONTROL/control 
    154155        cd $(BUILD_DIR); $(IPKG_BUILD) $(GIFT_IPK_DIR) 
    155156 
  • trunk/make/giftcurs.mk

    r920 r1327  
    6060GIFTCURS_SOURCE_DIR=$(SOURCE_DIR)/giftcurs 
    6161GIFTCURS_IPK_DIR=$(BUILD_DIR)/giftcurs-$(GIFTCURS_VERSION)-ipk 
    62 GIFTCURS_IPK=$(BUILD_DIR)/giftcurs_$(GIFTCURS_VERSION)-$(GIFTCURS_IPK_VERSION)_armeb.ipk 
     62GIFTCURS_IPK=$(BUILD_DIR)/giftcurs_$(GIFTCURS_VERSION)-$(GIFTCURS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    154154# 
    155155$(GIFTCURS_IPK): $(GIFTCURS_BUILD_DIR)/.built 
    156         rm -rf $(GIFTCURS_IPK_DIR) $(BUILD_DIR)/giftcurs_*_armeb.ipk 
     156        rm -rf $(GIFTCURS_IPK_DIR) $(BUILD_DIR)/giftcurs_*_$(TARGET_ARCH).ipk 
    157157        install -d $(GIFTCURS_IPK_DIR)/opt/bin 
    158158        $(STRIP_COMMAND) $(GIFTCURS_BUILD_DIR)/src/giFTcurs -o $(GIFTCURS_IPK_DIR)/opt/bin/giFTcurs 
  • trunk/make/gimp-print.mk

    r1261 r1327  
    6060GIMP-PRINT_SOURCE_DIR=$(SOURCE_DIR)/gimp-print 
    6161GIMP-PRINT_IPK_DIR=$(BUILD_DIR)/gimp-print-$(GIMP-PRINT_VERSION)-ipk 
    62 GIMP-PRINT_IPK=$(BUILD_DIR)/gimp-print_$(GIMP-PRINT_VERSION)-$(GIMP-PRINT_IPK_VERSION)_armeb.ipk 
     62GIMP-PRINT_IPK=$(BUILD_DIR)/gimp-print_$(GIMP-PRINT_VERSION)-$(GIMP-PRINT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(GIMP-PRINT_IPK): $(GIMP-PRINT_BUILD_DIR)/.built 
    150         rm -rf $(GIMP-PRINT_IPK_DIR) $(BUILD_DIR)/gimp-print_*_armeb.ipk 
     150        rm -rf $(GIMP-PRINT_IPK_DIR) $(BUILD_DIR)/gimp-print_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(GIMP-PRINT_BUILD_DIR) DESTDIR=$(GIMP-PRINT_IPK_DIR) install-strip 
    152152        install -d $(GIMP-PRINT_IPK_DIR)/CONTROL 
  • trunk/make/gkrellm.mk

    r661 r1327  
    1313GKRELLM_UNZIP=zcat 
    1414 
    15 GKRELLM_IPK=$(BUILD_DIR)/gkrellm_$(GKRELLM_VERSION)-1_armeb.ipk 
     15GKRELLM_IPK=$(BUILD_DIR)/gkrellm_$(GKRELLM_VERSION)-1_$(TARGET_ARCH).ipk 
    1616GKRELLM_IPK_DIR=$(BUILD_DIR)/gkrellm-$(GKRELLM_VERSION)-ipk 
    1717 
  • trunk/make/glib.mk

    r918 r1327  
    5858GLIB_SOURCE_DIR=$(SOURCE_DIR)/glib 
    5959GLIB_IPK_DIR=$(BUILD_DIR)/glib-$(GLIB_VERSION)-ipk 
    60 GLIB_IPK=$(BUILD_DIR)/glib_$(GLIB_VERSION)-$(GLIB_IPK_VERSION)_armeb.ipk 
     60GLIB_IPK=$(BUILD_DIR)/glib_$(GLIB_VERSION)-$(GLIB_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6161 
    6262# 
     
    150150# 
    151151$(GLIB_IPK): $(GLIB_BUILD_DIR)/.built 
    152         rm -rf $(GLIB_IPK_DIR) $(BUILD_DIR)/glib_*_armeb.ipk 
     152        rm -rf $(GLIB_IPK_DIR) $(BUILD_DIR)/glib_*_$(TARGET_ARCH).ipk 
    153153        $(MAKE) -C $(GLIB_BUILD_DIR) install-strip prefix=$(GLIB_IPK_DIR)/opt 
    154154        rm -rf $(GLIB_IPK_DIR)/opt/share/gtk-doc 
  • trunk/make/grep.mk

    r1237 r1327  
    1515GREP_IPK_VERSION=3 
    1616 
    17 GREP_IPK=$(BUILD_DIR)/grep_$(GREP_VERSION)-$(GREP_IPK_VERSION)_armeb.ipk 
     17GREP_IPK=$(BUILD_DIR)/grep_$(GREP_VERSION)-$(GREP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1818GREP_IPK_DIR=$(BUILD_DIR)/grep-$(GREP_VERSION)-ipk 
    1919 
     
    4343 
    4444$(GREP_IPK): $(GREP_DIR)/src/grep 
    45         rm -rf $(GREP_IPK_DIR) $(BUILD_DIR)/grep_*_armeb.ipk 
     45        rm -rf $(GREP_IPK_DIR) $(BUILD_DIR)/grep_*_$(TARGET_ARCH).ipk 
    4646        install -d $(GREP_IPK_DIR)/opt/bin 
    4747        $(STRIP_COMMAND) $(GREP_DIR)/src/grep -o $(GREP_IPK_DIR)/opt/bin/grep 
  • trunk/make/groff.mk

    r1041 r1327  
    1818GROFF_SOURCE_DIR=$(SOURCE_DIR)/groff 
    1919GROFF_IPK_DIR=$(BUILD_DIR)/groff-$(GROFF_VERSION)-ipk 
    20 GROFF_IPK=$(BUILD_DIR)/groff_$(GROFF_VERSION)-$(GROFF_IPK_VERSION)_armeb.ipk 
     20GROFF_IPK=$(BUILD_DIR)/groff_$(GROFF_VERSION)-$(GROFF_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(GROFF_SOURCE): 
     
    5353 
    5454$(GROFF_IPK): $(GROFF_BUILD_DIR)/.built 
    55         rm -rf $(GROFF_IPK_DIR) $(BUILD_DIR)/groff_*_armeb.ipk 
     55        rm -rf $(GROFF_IPK_DIR) $(BUILD_DIR)/groff_*_$(TARGET_ARCH).ipk 
    5656        install -d $(GROFF_IPK_DIR)/opt/bin 
    5757        install -d $(GROFF_IPK_DIR)/opt/info 
  • trunk/make/gtk.mk

    r1276 r1327  
    6363GTK_SOURCE_DIR=$(SOURCE_DIR)/gtk 
    6464GTK_IPK_DIR=$(BUILD_DIR)/gtk-$(GTK_VERSION)-ipk 
    65 GTK_IPK=$(BUILD_DIR)/gtk_$(GTK_VERSION)-$(GTK_IPK_VERSION)_armeb.ipk 
     65GTK_IPK=$(BUILD_DIR)/gtk_$(GTK_VERSION)-$(GTK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: gtk" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(GTK_PRIORITY)" >>$@ 
    7676        @echo "Section: $(GTK_SECTION)" >>$@ 
     
    184184# 
    185185$(GTK_IPK): $(GTK_BUILD_DIR)/.built 
    186         rm -rf $(GTK_IPK_DIR) $(BUILD_DIR)/gtk_*_armeb.ipk 
     186        rm -rf $(GTK_IPK_DIR) $(BUILD_DIR)/gtk_*_$(TARGET_ARCH).ipk 
    187187        $(MAKE) -C $(GTK_BUILD_DIR) DESTDIR=$(GTK_IPK_DIR) install-strip 
    188188        install -d $(GTK_IPK_DIR)/opt/etc/gtk-2.0 
  • trunk/make/gzip.mk

    r818 r1327  
    5050GZIP_SOURCE_DIR=$(SOURCE_DIR)/gzip 
    5151GZIP_IPK_DIR=$(BUILD_DIR)/gzip-$(GZIP_VERSION)-ipk 
    52 GZIP_IPK=$(BUILD_DIR)/gzip_$(GZIP_VERSION)-$(GZIP_IPK_VERSION)_armeb.ipk 
     52GZIP_IPK=$(BUILD_DIR)/gzip_$(GZIP_VERSION)-$(GZIP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5353 
    5454# 
     
    126126# 
    127127$(GZIP_IPK): $(GZIP_BUILD_DIR)/.built 
    128         rm -rf $(GZIP_IPK_DIR) $(BUILD_DIR)/gzip_*_armeb.ipk 
     128        rm -rf $(GZIP_IPK_DIR) $(BUILD_DIR)/gzip_*_$(TARGET_ARCH).ipk 
    129129        install -d $(GZIP_IPK_DIR)/opt/bin 
    130130        install -d $(GZIP_IPK_DIR)/opt/lib 
  • trunk/make/hdparm.mk

    r1268 r1327  
    6363HDPARM_SOURCE_DIR=$(SOURCE_DIR)/hdparm 
    6464HDPARM_IPK_DIR=$(BUILD_DIR)/hdparm-$(HDPARM_VERSION)-ipk 
    65 HDPARM_IPK=$(BUILD_DIR)/hdparm_$(HDPARM_VERSION)-$(HDPARM_IPK_VERSION)_armeb.ipk 
     65HDPARM_IPK=$(BUILD_DIR)/hdparm_$(HDPARM_VERSION)-$(HDPARM_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: hdparm" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(HDPARM_PRIORITY)" >>$@ 
    7676        @echo "Section: $(HDPARM_SECTION)" >>$@ 
     
    137137# 
    138138$(HDPARM_IPK): $(HDPARM_BUILD_DIR)/.built 
    139         rm -rf $(HDPARM_IPK_DIR) $(BUILD_DIR)/hdparm_*_armeb.ipk 
     139        rm -rf $(HDPARM_IPK_DIR) $(BUILD_DIR)/hdparm_*_$(TARGET_ARCH).ipk 
    140140        install -d $(HDPARM_IPK_DIR)/opt/sbin 
    141141        $(MAKE) -C $(HDPARM_BUILD_DIR) DESTDIR=$(HDPARM_IPK_DIR) install binprefix=/opt manprefix=/opt CC=$(TARGET_CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" 
  • trunk/make/ice.mk

    r1138 r1327  
    5757ICE_SOURCE_DIR=$(SOURCE_DIR)/ice 
    5858ICE_IPK_DIR=$(BUILD_DIR)/ice-$(ICE_VERSION)-ipk 
    59 ICE_IPK=$(BUILD_DIR)/ice_$(ICE_VERSION)-$(ICE_IPK_VERSION)_armeb.ipk 
     59ICE_IPK=$(BUILD_DIR)/ice_$(ICE_VERSION)-$(ICE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6060 
    6161# 
     
    6666        @rm -f $@ 
    6767        @echo "Package: ice" >>$@ 
    68         @echo "Architecture: armeb" >>$@ 
     68        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    6969        @echo "Priority: $(ICE_PRIORITY)" >>$@ 
    7070        @echo "Section: $(ICE_SECTION)" >>$@ 
     
    158158# 
    159159$(ICE_IPK): $(ICE_BUILD_DIR)/.built 
    160         rm -rf $(ICE_IPK_DIR) $(BUILD_DIR)/ice_*_armeb.ipk 
     160        rm -rf $(ICE_IPK_DIR) $(BUILD_DIR)/ice_*_$(TARGET_ARCH).ipk 
    161161        $(MAKE) -C $(ICE_BUILD_DIR) DESTDIR=$(ICE_IPK_DIR) install-strip 
    162162        $(MAKE) $(ICE_IPK_DIR)/CONTROL/control 
  • trunk/make/imagemagick.mk

    r1230 r1327  
    5858IMAGEMAGICK_SOURCE_DIR=$(SOURCE_DIR)/imagemagick 
    5959IMAGEMAGICK_IPK_DIR=$(BUILD_DIR)/imagemagick-$(IMAGEMAGICK_VERSION)-ipk 
    60 IMAGEMAGICK_IPK=$(BUILD_DIR)/imagemagick_$(IMAGEMAGICK_VERSION)-$(IMAGEMAGICK_REV)-$(IMAGEMAGICK_IPK_VERSION)_armeb.ipk 
     60IMAGEMAGICK_IPK=$(BUILD_DIR)/imagemagick_$(IMAGEMAGICK_VERSION)-$(IMAGEMAGICK_REV)-$(IMAGEMAGICK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6161 
    6262# 
     
    159159# 
    160160$(IMAGEMAGICK_IPK): $(IMAGEMAGICK_BUILD_DIR)/.built 
    161         rm -rf $(IMAGEMAGICK_IPK_DIR) $(BUILD_DIR)/imagemagick_*_armeb.ipk 
     161        rm -rf $(IMAGEMAGICK_IPK_DIR) $(BUILD_DIR)/imagemagick_*_$(TARGET_ARCH).ipk 
    162162        $(MAKE) -C $(IMAGEMAGICK_BUILD_DIR) DESTDIR=$(IMAGEMAGICK_IPK_DIR) install-am 
    163163        rm -f $(IMAGEMAGICK_IPK_DIR)/opt/bin/* 
  • trunk/make/inetutils.mk

    r449 r1327  
    1616INETUTILS_SOURCE_DIR=$(SOURCE_DIR)/inetutils 
    1717 
    18 INETUTILS_IPK:=$(BUILD_DIR)/inetutils_$(INETUTILS_VERSION)-$(INETUTILS_IPK_VERSION)_armeb.ipk 
     18INETUTILS_IPK:=$(BUILD_DIR)/inetutils_$(INETUTILS_VERSION)-$(INETUTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1919INETUTILS_IPK_DIR:=$(BUILD_DIR)/inetutils-$(INETUTILS_VERSION)-ipk 
    2020 
  • trunk/make/iptables.mk

    r739 r1327  
    1616IPTABLES_SOURCE_DIR=$(SOURCE_DIR)/iptables 
    1717IPTABLES_IPK_DIR=$(BUILD_DIR)/iptables-$(IPTABLES_VERSION)-ipk 
    18 IPTABLES_IPK=$(BUILD_DIR)/iptables_$(IPTABLES_VERSION)-$(IPTABLES_IPK_VERSION)_armeb.ipk 
     18IPTABLES_IPK=$(BUILD_DIR)/iptables_$(IPTABLES_VERSION)-$(IPTABLES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1919 
    2020$(DL_DIR)/$(IPTABLES_SOURCE): 
  • trunk/make/ircd-hybrid.mk

    r930 r1327  
    1414IRCD_HYBRID_IPK_VERSION=2 
    1515 
    16 IRCD_HYBRID_IPK=$(BUILD_DIR)/ircd-hybrid_$(IRCD_HYBRID_VERSION)-$(IRCD_HYBRID_IPK_VERSION)_armeb.ipk 
     16IRCD_HYBRID_IPK=$(BUILD_DIR)/ircd-hybrid_$(IRCD_HYBRID_VERSION)-$(IRCD_HYBRID_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1717IRCD_HYBRID_IPK_DIR=$(BUILD_DIR)/ircd-hybrid-$(IRCD_HYBRID_VERSION)-ipk 
    1818 
  • trunk/make/irssi.mk

    r1077 r1327  
    5858IRSSI_SOURCE_DIR=$(SOURCE_DIR)/irssi 
    5959IRSSI_IPK_DIR=$(BUILD_DIR)/irssi-$(IRSSI_VERSION)-ipk 
    60 IRSSI_IPK=$(BUILD_DIR)/irssi_$(IRSSI_VERSION)-$(IRSSI_IPK_VERSION)_armeb.ipk 
     60IRSSI_IPK=$(BUILD_DIR)/irssi_$(IRSSI_VERSION)-$(IRSSI_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6161 
    6262# 
     
    151151# 
    152152$(IRSSI_IPK): $(IRSSI_BUILD_DIR)/.built 
    153         rm -rf $(IRSSI_IPK_DIR) $(BUILD_DIR)/irssi_*_armeb.ipk 
     153        rm -rf $(IRSSI_IPK_DIR) $(BUILD_DIR)/irssi_*_$(TARGET_ARCH).ipk 
    154154        $(MAKE) -C $(IRSSI_BUILD_DIR) DESTDIR=$(IRSSI_IPK_DIR) install-strip 
    155155#       install -d $(IRSSI_IPK_DIR)/opt/etc/ 
  • trunk/make/jamvm.mk

    r958 r1327  
    6060JAMVM_SOURCE_DIR=$(SOURCE_DIR)/jamvm 
    6161JAMVM_IPK_DIR=$(BUILD_DIR)/jamvm-$(JAMVM_VERSION)-ipk 
    62 JAMVM_IPK=$(BUILD_DIR)/jamvm_$(JAMVM_VERSION)-$(JAMVM_IPK_VERSION)_armeb.ipk 
     62JAMVM_IPK=$(BUILD_DIR)/jamvm_$(JAMVM_VERSION)-$(JAMVM_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    153153# 
    154154$(JAMVM_IPK): $(JAMVM_BUILD_DIR)/.built 
    155         rm -rf $(JAMVM_IPK_DIR) $(BUILD_DIR)/jamvm_*_armeb.ipk 
     155        rm -rf $(JAMVM_IPK_DIR) $(BUILD_DIR)/jamvm_*_$(TARGET_ARCH).ipk 
    156156        $(MAKE) -C $(JAMVM_BUILD_DIR) install-strip prefix=$(JAMVM_IPK_DIR)/opt 
    157157        install -d $(JAMVM_IPK_DIR)/CONTROL 
  • trunk/make/jikes.mk

    r904 r1327  
    5555JIKES_SOURCE_DIR=$(SOURCE_DIR)/jikes 
    5656JIKES_IPK_DIR=$(BUILD_DIR)/jikes-$(JIKES_VERSION)-ipk 
    57 JIKES_IPK=$(BUILD_DIR)/jikes_$(JIKES_VERSION)-$(JIKES_IPK_VERSION)_armeb.ipk 
     57JIKES_IPK=$(BUILD_DIR)/jikes_$(JIKES_VERSION)-$(JIKES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    143143# 
    144144$(JIKES_IPK): $(JIKES_BUILD_DIR)/.built 
    145         rm -rf $(JIKES_IPK_DIR) $(BUILD_DIR)/jikes_*_armeb.ipk 
     145        rm -rf $(JIKES_IPK_DIR) $(BUILD_DIR)/jikes_*_$(TARGET_ARCH).ipk 
    146146        $(MAKE) -C $(JIKES_BUILD_DIR) DESTDIR=$(JIKES_IPK_DIR) install 
    147147        $(STRIP_COMMAND) $(JIKES_IPK_DIR)/opt/bin/jikes 
  • trunk/make/joe.mk

    r984 r1327  
    5454JOE_SOURCE_DIR=$(SOURCE_DIR)/joe 
    5555JOE_IPK_DIR=$(BUILD_DIR)/joe-$(JOE_VERSION)-ipk 
    56 JOE_IPK=$(BUILD_DIR)/joe_$(JOE_VERSION)-$(JOE_IPK_VERSION)_armeb.ipk 
     56JOE_IPK=$(BUILD_DIR)/joe_$(JOE_VERSION)-$(JOE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5757 
    5858# 
     
    140140# 
    141141$(JOE_IPK): $(JOE_BUILD_DIR)/.built 
    142         rm -rf $(JOE_IPK_DIR) $(BUILD_DIR)/joe_*_armeb.ipk 
     142        rm -rf $(JOE_IPK_DIR) $(BUILD_DIR)/joe_*_$(TARGET_ARCH).ipk 
    143143        $(MAKE) -C $(JOE_BUILD_DIR) DESTDIR=$(JOE_IPK_DIR) install-strip 
    144144        install -d $(JOE_IPK_DIR)/opt/etc/ 
  • trunk/make/jove.mk

    r661 r1327  
    4141JOVE_SOURCE_DIR=$(SOURCE_DIR)/jove 
    4242JOVE_IPK_DIR=$(BUILD_DIR)/jove-$(JOVE_VERSION)-ipk 
    43 JOVE_IPK=$(BUILD_DIR)/jove_$(JOVE_VERSION)-$(JOVE_IPK_VERSION)_armeb.ipk 
     43JOVE_IPK=$(BUILD_DIR)/jove_$(JOVE_VERSION)-$(JOVE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4444 
    4545# 
  • trunk/make/kaffe.mk

    r934 r1327  
    5858KAFFE_SOURCE_DIR=$(SOURCE_DIR)/kaffe 
    5959KAFFE_IPK_DIR=$(BUILD_DIR)/kaffe-$(KAFFE_VERSION)-ipk 
    60 KAFFE_IPK=$(BUILD_DIR)/kaffe_$(KAFFE_VERSION)-$(KAFFE_IPK_VERSION)_armeb.ipk 
     60KAFFE_IPK=$(BUILD_DIR)/kaffe_$(KAFFE_VERSION)-$(KAFFE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6161 
    6262# 
     
    159159# 
    160160$(KAFFE_IPK): $(KAFFE_BUILD_DIR)/.built 
    161         rm -rf $(KAFFE_IPK_DIR) $(BUILD_DIR)/kaffe_*_armeb.ipk 
     161        rm -rf $(KAFFE_IPK_DIR) $(BUILD_DIR)/kaffe_*_$(TARGET_ARCH).ipk 
    162162        $(MAKE) -C $(KAFFE_BUILD_DIR) DESTDIR=$(KAFFE_IPK_DIR) install 
    163163#       install -d $(KAFFE_IPK_DIR)/opt/etc/ 
  • trunk/make/lame.mk

    r1137 r1327  
    6060LAME_SOURCE_DIR=$(SOURCE_DIR)/lame 
    6161LAME_IPK_DIR=$(BUILD_DIR)/lame-$(LAME_VERSION)-ipk 
    62 LAME_IPK=$(BUILD_DIR)/lame_$(LAME_VERSION)-$(LAME_IPK_VERSION)_armeb.ipk 
     62LAME_IPK=$(BUILD_DIR)/lame_$(LAME_VERSION)-$(LAME_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(LAME_IPK): $(LAME_BUILD_DIR)/.built 
    150         rm -rf $(LAME_IPK_DIR) $(BUILD_DIR)/lame_*_armeb.ipk 
     150        rm -rf $(LAME_IPK_DIR) $(BUILD_DIR)/lame_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(LAME_BUILD_DIR) DESTDIR=$(LAME_IPK_DIR) install-strip 
    152152        install -d $(LAME_IPK_DIR)/CONTROL 
  • trunk/make/less.mk

    r774 r1327  
    4141LESS_SOURCE_DIR=$(SOURCE_DIR)/less 
    4242LESS_IPK_DIR=$(BUILD_DIR)/less-$(LESS_VERSION)-ipk 
    43 LESS_IPK=$(BUILD_DIR)/less_$(LESS_VERSION)-$(LESS_IPK_VERSION)_armeb.ipk 
     43LESS_IPK=$(BUILD_DIR)/less_$(LESS_VERSION)-$(LESS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4444 
    4545# 
     
    119119# 
    120120$(LESS_IPK): $(LESS_BUILD_DIR)/less 
    121         rm -rf $(LESS_IPK_DIR) $(BUILD_DIR)/less_*_armeb.ipk 
     121        rm -rf $(LESS_IPK_DIR) $(BUILD_DIR)/less_*_$(TARGET_ARCH).ipk 
    122122        install -d $(LESS_IPK_DIR)/opt/bin 
    123123        $(STRIP_COMMAND) $(LESS_BUILD_DIR)/less -o $(LESS_IPK_DIR)/opt/bin/less 
  • trunk/make/libao.mk

    r1255 r1327  
    6060LIBAO_SOURCE_DIR=$(SOURCE_DIR)/libao 
    6161LIBAO_IPK_DIR=$(BUILD_DIR)/libao-$(LIBAO_VERSION)-ipk 
    62 LIBAO_IPK=$(BUILD_DIR)/libao_$(LIBAO_VERSION)-$(LIBAO_IPK_VERSION)_armeb.ipk 
     62LIBAO_IPK=$(BUILD_DIR)/libao_$(LIBAO_VERSION)-$(LIBAO_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    147147# 
    148148$(LIBAO_IPK): $(LIBAO_BUILD_DIR)/.built 
    149         rm -rf $(LIBAO_IPK_DIR) $(BUILD_DIR)/libao_*_armeb.ipk 
     149        rm -rf $(LIBAO_IPK_DIR) $(BUILD_DIR)/libao_*_$(TARGET_ARCH).ipk 
    150150        $(MAKE) -C $(LIBAO_BUILD_DIR) DESTDIR=$(LIBAO_IPK_DIR) install 
    151151        install -d $(LIBAO_IPK_DIR)/CONTROL 
  • trunk/make/libbt.mk

    r935 r1327  
    5353LIBBT_SOURCE_DIR=$(SOURCE_DIR)/libbt 
    5454LIBBT_IPK_DIR=$(BUILD_DIR)/libbt-$(LIBBT_VERSION)-ipk 
    55 LIBBT_IPK=$(BUILD_DIR)/libbt_$(LIBBT_VERSION)-$(LIBBT_IPK_VERSION)_armeb.ipk 
     55LIBBT_IPK=$(BUILD_DIR)/libbt_$(LIBBT_VERSION)-$(LIBBT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5656 
    5757# 
     
    132132# 
    133133$(LIBBT_IPK): $(LIBBT_BUILD_DIR)/src/libbt.a 
    134         rm -rf $(LIBBT_IPK_DIR) $(BUILD_DIR)/libbt_*_armeb.ipk 
     134        rm -rf $(LIBBT_IPK_DIR) $(BUILD_DIR)/libbt_*_$(TARGET_ARCH).ipk 
    135135        mkdir -p $(LIBBT_IPK_DIR)/CONTROL 
    136136        cp $(SOURCE_DIR)/libbt/control $(LIBBT_IPK_DIR)/CONTROL/control 
  • trunk/make/libcurl.mk

    r378 r1327  
    5757LIBCURL_SOURCE_DIR=$(SOURCE_DIR)/libcurl 
    5858LIBCURL_IPK_DIR=$(BUILD_DIR)/libcurl-$(LIBCURL_VERSION)-ipk 
    59 LIBCURL_IPK=$(BUILD_DIR)/libcurl_$(LIBCURL_VERSION)-$(LIBCURL_IPK_VERSION)_armeb.ipk 
     59LIBCURL_IPK=$(BUILD_DIR)/libcurl_$(LIBCURL_VERSION)-$(LIBCURL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6060 
    6161# 
  • trunk/make/libdb.mk

    r661 r1327  
    7474LIBDB_SOURCE_DIR=$(SOURCE_DIR)/libdb 
    7575LIBDB_IPK_DIR=$(BUILD_DIR)/libdb-$(LIBDB_VERSION)-ipk 
    76 LIBDB_IPK=$(BUILD_DIR)/libdb_$(LIBDB_VERSION)-$(LIBDB_IPK_VERSION)_armeb.ipk 
     76LIBDB_IPK=$(BUILD_DIR)/libdb_$(LIBDB_VERSION)-$(LIBDB_IPK_VERSION)_$(TARGET_ARCH).ipk 
    7777 
    7878# 
  • trunk/make/libdvdread.mk

    r1226 r1327  
    6060LIBDVDREAD_SOURCE_DIR=$(SOURCE_DIR)/libdvdread 
    6161LIBDVDREAD_IPK_DIR=$(BUILD_DIR)/libdvdread-$(LIBDVDREAD_VERSION)-ipk 
    62 LIBDVDREAD_IPK=$(BUILD_DIR)/libdvdread_$(LIBDVDREAD_VERSION)-$(LIBDVDREAD_IPK_VERSION)_armeb.ipk 
     62LIBDVDREAD_IPK=$(BUILD_DIR)/libdvdread_$(LIBDVDREAD_VERSION)-$(LIBDVDREAD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(LIBDVDREAD_IPK): $(LIBDVDREAD_BUILD_DIR)/.built 
    150         rm -rf $(LIBDVDREAD_IPK_DIR) $(BUILD_DIR)/libdvdread_*_armeb.ipk 
     150        rm -rf $(LIBDVDREAD_IPK_DIR) $(BUILD_DIR)/libdvdread_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(LIBDVDREAD_BUILD_DIR) DESTDIR=$(LIBDVDREAD_IPK_DIR) install 
    152152        install -d $(LIBDVDREAD_IPK_DIR)/CONTROL 
  • trunk/make/libevent.mk

    r279 r1327  
    1818LIBEVENT_SOURCE_DIR=$(SOURCE_DIR)/libevent 
    1919LIBEVENT_IPK_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VERSION)-ipk 
    20 LIBEVENT_IPK=$(BUILD_DIR)/libevent_$(LIBEVENT_VERSION)-$(LIBEVENT_IPK_VERSION)_armeb.ipk 
     20LIBEVENT_IPK=$(BUILD_DIR)/libevent_$(LIBEVENT_VERSION)-$(LIBEVENT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(LIBEVENT_SOURCE): 
  • trunk/make/libgd.mk

    r1296 r1327  
    6363LIBGD_SOURCE_DIR=$(SOURCE_DIR)/libgd 
    6464LIBGD_IPK_DIR=$(BUILD_DIR)/libgd-$(LIBGD_VERSION)-ipk 
    65 LIBGD_IPK=$(BUILD_DIR)/libgd_$(LIBGD_VERSION)-$(LIBGD_IPK_VERSION)_armeb.ipk 
     65LIBGD_IPK=$(BUILD_DIR)/libgd_$(LIBGD_VERSION)-$(LIBGD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: libgd" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(LIBGD_PRIORITY)" >>$@ 
    7676        @echo "Section: $(LIBGD_SECTION)" >>$@ 
     
    171171# 
    172172$(LIBGD_IPK): $(LIBGD_BUILD_DIR)/.built 
    173         rm -rf $(LIBGD_IPK_DIR) $(BUILD_DIR)/libgd_*_armeb.ipk 
     173        rm -rf $(LIBGD_IPK_DIR) $(BUILD_DIR)/libgd_*_$(TARGET_ARCH).ipk 
    174174        $(MAKE) -C $(LIBGD_BUILD_DIR) DESTDIR=$(LIBGD_IPK_DIR) install-strip 
    175175        rm -f $(LIBGD_IPK_DIR)/opt/lib/*.la 
  • trunk/make/libiconv.mk

    r1321 r1327  
    6060LIBICONV_SOURCE_DIR=$(SOURCE_DIR)/libiconv 
    6161LIBICONV_IPK_DIR=$(BUILD_DIR)/libiconv-$(LIBICONV_VERSION)-ipk 
    62 LIBICONV_IPK=$(BUILD_DIR)/libiconv_$(LIBICONV_VERSION)-$(LIBICONV_IPK_VERSION)_armeb.ipk 
     62LIBICONV_IPK=$(BUILD_DIR)/libiconv_$(LIBICONV_VERSION)-$(LIBICONV_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    147147# 
    148148$(LIBICONV_IPK): $(LIBICONV_BUILD_DIR)/.built 
    149         rm -rf $(LIBICONV_IPK_DIR) $(BUILD_DIR)/libiconv_*_armeb.ipk 
     149        rm -rf $(LIBICONV_IPK_DIR) $(BUILD_DIR)/libiconv_*_$(TARGET_ARCH).ipk 
    150150        $(MAKE) -C $(LIBICONV_BUILD_DIR) install prefix=$(LIBICONV_IPK_DIR)/opt 
    151151        install -d $(LIBICONV_IPK_DIR)/CONTROL 
  • trunk/make/libid3tag.mk

    r739 r1327  
    1717LIBID3TAG_SOURCE_DIR=$(SOURCE_DIR)/libid3tag 
    1818LIBID3TAG_IPK_DIR=$(BUILD_DIR)/libid3tag-$(LIBID3TAG_VERSION)-ipk 
    19 LIBID3TAG_IPK=$(BUILD_DIR)/libid3tag_$(LIBID3TAG_VERSION)-$(LIBID3TAG_IPK_VERSION)_armeb.ipk 
     19LIBID3TAG_IPK=$(BUILD_DIR)/libid3tag_$(LIBID3TAG_VERSION)-$(LIBID3TAG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2020 
    2121$(DL_DIR)/$(LIBID3TAG_SOURCE): 
     
    5959        rm -f $(LIBID3TAG_IPK_DIR)/opt/lib/*.{la,a} 
    6060        install -d $(LIBID3TAG_IPK_DIR)/CONTROL 
    61         install -m 644 $(LIBID3TAG_SOURCE_DIR)/control $(LIBID3TAG_IPK_DIR)/CONTROL/control 
     61        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(LIBID3TAG_VERSION)/" \ 
     62                -e "s/@RELEASE@/$(LIBID3TAG_IPK_VERSION)/" $(LIBID3TAG_SOURCE_DIR)/control > $(LIBID3TAG_IPK_DIR)/CONTROL/control 
    6263        cd $(BUILD_DIR); $(IPKG_BUILD) $(LIBID3TAG_IPK_DIR) 
    6364 
  • trunk/make/libjpeg.mk

    r1127 r1327  
    5656LIBJPEG_SOURCE_DIR=$(SOURCE_DIR)/libjpeg 
    5757LIBJPEG_IPK_DIR=$(BUILD_DIR)/libjpeg-$(LIBJPEG_VERSION)-ipk 
    58 LIBJPEG_IPK=$(BUILD_DIR)/libjpeg_$(LIBJPEG_VERSION)-$(LIBJPEG_IPK_VERSION)_armeb.ipk 
     58LIBJPEG_IPK=$(BUILD_DIR)/libjpeg_$(LIBJPEG_VERSION)-$(LIBJPEG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/libmad.mk

    r1253 r1327  
    6060LIBMAD_SOURCE_DIR=$(SOURCE_DIR)/libmad 
    6161LIBMAD_IPK_DIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)-ipk 
    62 LIBMAD_IPK=$(BUILD_DIR)/libmad_$(LIBMAD_VERSION)-$(LIBMAD_IPK_VERSION)_armeb.ipk 
     62LIBMAD_IPK=$(BUILD_DIR)/libmad_$(LIBMAD_VERSION)-$(LIBMAD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    147147# 
    148148$(LIBMAD_IPK): $(LIBMAD_BUILD_DIR)/.built 
    149         rm -rf $(LIBMAD_IPK_DIR) $(BUILD_DIR)/libmad_*_armeb.ipk 
     149        rm -rf $(LIBMAD_IPK_DIR) $(BUILD_DIR)/libmad_*_$(TARGET_ARCH).ipk 
    150150        $(MAKE) -C $(LIBMAD_BUILD_DIR) DESTDIR=$(LIBMAD_IPK_DIR) install 
    151151        install -d $(LIBMAD_IPK_DIR)/CONTROL 
    152         install -m 644 $(LIBMAD_SOURCE_DIR)/control $(LIBMAD_IPK_DIR)/CONTROL/control 
     152        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(LIBMAD_VERSION)/" \ 
     153                -e "s/@RELEASE@/$(LIBMAD_IPK_VERSION)/" $(LIBMAD_SOURCE_DIR)/control > $(LIBMAD_IPK_DIR)/CONTROL/control 
    153154        echo $(LIBMAD_CONFFILES) | sed -e 's/ /\n/g' > $(LIBMAD_IPK_DIR)/CONTROL/conffiles 
    154155        cd $(BUILD_DIR); $(IPKG_BUILD) $(LIBMAD_IPK_DIR) 
  • trunk/make/libnsl.mk

    r940 r1327  
    1414LIBNSL_SOURCE_DIR=$(SOURCE_DIR)/libnsl 
    1515LIBNSL_IPK_DIR=$(BUILD_DIR)/libnsl-$(LIBNSL_VERSION)-ipk 
    16 LIBNSL_IPK=$(BUILD_DIR)/libnsl_$(LIBNSL_VERSION)-$(LIBNSL_IPK_VERSION)_armeb.ipk 
     16LIBNSL_IPK=$(BUILD_DIR)/libnsl_$(LIBNSL_VERSION)-$(LIBNSL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1717 
    1818$(LIBNSL_BUILD_DIR)/.configured:  
     
    4545 
    4646$(LIBNSL_IPK): $(LIBNSL_BUILD_DIR)/.built 
    47         rm -rf $(LIBNSL_IPK_DIR) $(BUILD_DIR)/libnsl_*_armeb.ipk 
     47        rm -rf $(LIBNSL_IPK_DIR) $(BUILD_DIR)/libnsl_*_$(TARGET_ARCH).ipk 
    4848        install -d $(LIBNSL_IPK_DIR)/opt/lib 
    4949        install -m 644 $(LIBNSL_BUILD_DIR)/$(LIBNSL_LIBNAME)-$(LIBNSL_VERSION).so $(LIBNSL_IPK_DIR)/opt/lib 
  • trunk/make/libogg.mk

    r1325 r1327  
    6161LIBOGG_SOURCE_DIR=$(SOURCE_DIR)/libogg 
    6262LIBOGG_IPK_DIR=$(BUILD_DIR)/libogg-$(LIBOGG_VERSION)-ipk 
    63 LIBOGG_IPK=$(BUILD_DIR)/libogg_$(LIBOGG_VERSION)-$(LIBOGG_IPK_VERSION)_armeb.ipk 
     63LIBOGG_IPK=$(BUILD_DIR)/libogg_$(LIBOGG_VERSION)-$(LIBOGG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    151151# 
    152152$(LIBOGG_IPK): $(LIBOGG_BUILD_DIR)/.built 
    153         rm -rf $(LIBOGG_IPK_DIR) $(BUILD_DIR)/libogg_*_armeb.ipk 
     153        rm -rf $(LIBOGG_IPK_DIR) $(BUILD_DIR)/libogg_*_$(TARGET_ARCH).ipk 
    154154        $(MAKE) -C $(LIBOGG_BUILD_DIR) DESTDIR=$(LIBOGG_IPK_DIR) install 
    155155        install -d $(LIBOGG_IPK_DIR)/CONTROL 
    156         install -m 644 $(LIBOGG_SOURCE_DIR)/control $(LIBOGG_IPK_DIR)/CONTROL/control 
     156        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(LIBOGG_VERSION)/" \ 
     157                -e "s/@RELEASE@/$(LIBOGG_IPK_VERSION)/" $(LIBOGG_SOURCE_DIR)/control > $(LIBOGG_IPK_DIR)/CONTROL/control 
    157158        cd $(BUILD_DIR); $(IPKG_BUILD) $(LIBOGG_IPK_DIR) 
    158159 
  • trunk/make/libol.mk

    r1178 r1327  
    6161LIBOL_SOURCE_DIR=$(SOURCE_DIR)/libol 
    6262LIBOL_IPK_DIR=$(BUILD_DIR)/libol-$(LIBOL_VERSION)-ipk 
    63 LIBOL_IPK=$(BUILD_DIR)/libol_$(LIBOL_VERSION)-$(LIBOL_IPK_VERSION)_armeb.ipk 
     63LIBOL_IPK=$(BUILD_DIR)/libol_$(LIBOL_VERSION)-$(LIBOL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    149149# 
    150150$(LIBOL_IPK): $(LIBOL_BUILD_DIR)/.built 
    151         rm -rf $(LIBOL_IPK_DIR) $(BUILD_DIR)/libol_*_armeb.ipk 
     151        rm -rf $(LIBOL_IPK_DIR) $(BUILD_DIR)/libol_*_$(TARGET_ARCH).ipk 
    152152        $(MAKE) -C $(LIBOL_BUILD_DIR) DESTDIR=$(LIBOL_IPK_DIR) install 
    153153        install -d $(LIBOL_IPK_DIR)/CONTROL 
  • trunk/make/libpcap.mk

    r428 r1327  
    5656LIBPCAP_SOURCE_DIR=$(SOURCE_DIR)/libpcap 
    5757LIBPCAP_IPK_DIR=$(BUILD_DIR)/libpcap-$(LIBPCAP_VERSION)-ipk 
    58 LIBPCAP_IPK=$(BUILD_DIR)/libpcap_$(LIBPCAP_VERSION)-$(LIBPCAP_IPK_VERSION)_armeb.ipk 
     58LIBPCAP_IPK=$(BUILD_DIR)/libpcap_$(LIBPCAP_VERSION)-$(LIBPCAP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/libpng.mk

    r1302 r1327  
    5656LIBPNG_SOURCE_DIR=$(SOURCE_DIR)/libpng 
    5757LIBPNG_IPK_DIR=$(BUILD_DIR)/libpng-$(LIBPNG_VERSION)-ipk 
    58 LIBPNG_IPK=$(BUILD_DIR)/libpng_$(LIBPNG_VERSION)-$(LIBPNG_IPK_VERSION)_armeb.ipk 
     58LIBPNG_IPK=$(BUILD_DIR)/libpng_$(LIBPNG_VERSION)-$(LIBPNG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/libstdc++.mk

    r941 r1327  
    1414LIBSTDC++_SOURCE_DIR=$(SOURCE_DIR)/libstdc++ 
    1515LIBSTDC++_IPK_DIR=$(BUILD_DIR)/libstdc++-$(LIBSTDC++_VERSION)-ipk 
    16 LIBSTDC++_IPK=$(BUILD_DIR)/libstdc++_$(LIBSTDC++_VERSION)-$(LIBSTDC++_IPK_VERSION)_armeb.ipk 
     16LIBSTDC++_IPK=$(BUILD_DIR)/libstdc++_$(LIBSTDC++_VERSION)-$(LIBSTDC++_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1717 
    1818$(LIBSTDC++_BUILD_DIR)/.configured: $(LIBSTDC++_PATCHES) 
     
    4545 
    4646$(LIBSTDC++_IPK): $(LIBSTDC++_BUILD_DIR)/.built 
    47         rm -rf $(LIBSTDC++_IPK_DIR) $(BUILD_DIR)/libstdc++_*_armeb.ipk 
     47        rm -rf $(LIBSTDC++_IPK_DIR) $(BUILD_DIR)/libstdc++_*_$(TARGET_ARCH).ipk 
    4848        install -d $(LIBSTDC++_IPK_DIR)/opt/lib 
    4949        install -m 644 $(LIBSTDC++_BUILD_DIR)/$(LIBSTDC++_LIBNAME).$(LIBSTDC++_VERSION) $(LIBSTDC++_IPK_DIR)/opt/lib 
  • trunk/make/libtiff.mk

    r1302 r1327  
    5656LIBTIFF_SOURCE_DIR=$(SOURCE_DIR)/libtiff 
    5757LIBTIFF_IPK_DIR=$(BUILD_DIR)/libtiff-$(LIBTIFF_VERSION)-ipk 
    58 LIBTIFF_IPK=$(BUILD_DIR)/libtiff_$(LIBTIFF_VERSION)-$(LIBTIFF_IPK_VERSION)_armeb.ipk 
     58LIBTIFF_IPK=$(BUILD_DIR)/libtiff_$(LIBTIFF_VERSION)-$(LIBTIFF_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/libtool.mk

    r1050 r1327  
    5656LIBTOOL_SOURCE_DIR=$(SOURCE_DIR)/libtool 
    5757LIBTOOL_IPK_DIR=$(BUILD_DIR)/libtool-$(LIBTOOL_VERSION)-ipk 
    58 LIBTOOL_IPK=$(BUILD_DIR)/libtool_$(LIBTOOL_VERSION)-$(LIBTOOL_IPK_VERSION)_armeb.ipk 
     58LIBTOOL_IPK=$(BUILD_DIR)/libtool_$(LIBTOOL_VERSION)-$(LIBTOOL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    145145# 
    146146$(LIBTOOL_IPK): $(LIBTOOL_BUILD_DIR)/libltdl/.libs/libltdl.so.3.1.0 
    147         rm -rf $(LIBTOOL_IPK_DIR) $(BUILD_DIR)/libtool_*_armeb.ipk 
     147        rm -rf $(LIBTOOL_IPK_DIR) $(BUILD_DIR)/libtool_*_$(TARGET_ARCH).ipk 
    148148        $(MAKE) -C $(LIBTOOL_BUILD_DIR) DESTDIR=$(LIBTOOL_IPK_DIR) install-strip 
    149149        rm -f $(LIBTOOL_IPK_DIR)/opt/info/dir 
    150150        install -d $(LIBTOOL_IPK_DIR)/CONTROL 
    151         install -m 644 $(LIBTOOL_SOURCE_DIR)/control $(LIBTOOL_IPK_DIR)/CONTROL/control 
     151        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(LIBTOOL_VERSION)/" \ 
     152                -e "s/@RELEASE@/$(LIBTOOL_IPK_VERSION)/" $(LIBTOOL_SOURCE_DIR)/control > $(LIBTOOL_IPK_DIR)/CONTROL/control 
    152153        cd $(BUILD_DIR); $(IPKG_BUILD) $(LIBTOOL_IPK_DIR) 
    153154 
  • trunk/make/libusb.mk

    r424 r1327  
    5252LIBUSB_SOURCE_DIR=$(SOURCE_DIR)/libusb 
    5353LIBUSB_IPK_DIR=$(BUILD_DIR)/libusb-$(LIBUSB_VERSION)-ipk 
    54 LIBUSB_IPK=$(BUILD_DIR)/libusb_$(LIBUSB_VERSION)-$(LIBUSB_IPK_VERSION)_armeb.ipk 
     54LIBUSB_IPK=$(BUILD_DIR)/libusb_$(LIBUSB_VERSION)-$(LIBUSB_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5555 
    5656# 
  • trunk/make/libvorbis.mk

    r1325 r1327  
    6262LIBVORBIS_SOURCE_DIR=$(SOURCE_DIR)/libvorbis 
    6363LIBVORBIS_IPK_DIR=$(BUILD_DIR)/libvorbis-$(LIBVORBIS_VERSION)-ipk 
    64 LIBVORBIS_IPK=$(BUILD_DIR)/libvorbis_$(LIBVORBIS_VERSION)-$(LIBVORBIS_IPK_VERSION)_armeb.ipk 
     64LIBVORBIS_IPK=$(BUILD_DIR)/libvorbis_$(LIBVORBIS_VERSION)-$(LIBVORBIS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6565 
    6666# 
     
    153153# 
    154154$(LIBVORBIS_IPK): $(LIBVORBIS_BUILD_DIR)/.built 
    155         rm -rf $(LIBVORBIS_IPK_DIR) $(BUILD_DIR)/libvorbis_*_armeb.ipk 
     155        rm -rf $(LIBVORBIS_IPK_DIR) $(BUILD_DIR)/libvorbis_*_$(TARGET_ARCH).ipk 
    156156        $(MAKE) -C $(LIBVORBIS_BUILD_DIR) DESTDIR=$(LIBVORBIS_IPK_DIR) install 
    157157        install -d $(LIBVORBIS_IPK_DIR)/CONTROL 
    158         install -m 644 $(LIBVORBIS_SOURCE_DIR)/control $(LIBVORBIS_IPK_DIR)/CONTROL/control 
     158        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(LIBVORBIS_VERSION)/" \ 
     159                -e "s/@RELEASE@/$(LIBVORBIS_IPK_VERSION)/" $(LIBVORBIS_SOURCE_DIR)/control > $(LIBVORBIS_IPK_DIR)/CONTROL/control 
    159160        cd $(BUILD_DIR); $(IPKG_BUILD) $(LIBVORBIS_IPK_DIR) 
    160161 
  • trunk/make/libxml2.mk

    r1318 r1327  
    5555LIBXML2_SOURCE_DIR=$(SOURCE_DIR)/libxml2 
    5656LIBXML2_IPK_DIR=$(BUILD_DIR)/libxml2-$(LIBXML2_VERSION)-ipk 
    57 LIBXML2_IPK=$(BUILD_DIR)/libxml2_$(LIBXML2_VERSION)-$(LIBXML2_IPK_VERSION)_armeb.ipk 
     57LIBXML2_IPK=$(BUILD_DIR)/libxml2_$(LIBXML2_VERSION)-$(LIBXML2_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    148148# 
    149149$(LIBXML2_IPK): $(LIBXML2_BUILD_DIR)/.built 
    150         rm -rf $(LIBXML2_IPK_DIR) $(BUILD_DIR)/libxml2_*_armeb.ipk 
     150        rm -rf $(LIBXML2_IPK_DIR) $(BUILD_DIR)/libxml2_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(LIBXML2_BUILD_DIR) DESTDIR=$(LIBXML2_IPK_DIR) install 
    152152        # remove .la to avoid libtool problems 
  • trunk/make/libxslt.mk

    r1318 r1327  
    5555LIBXSLT_SOURCE_DIR=$(SOURCE_DIR)/libxslt 
    5656LIBXSLT_IPK_DIR=$(BUILD_DIR)/libxslt-$(LIBXSLT_VERSION)-ipk 
    57 LIBXSLT_IPK=$(BUILD_DIR)/libxslt_$(LIBXSLT_VERSION)-$(LIBXSLT_IPK_VERSION)_armeb.ipk 
     57LIBXSLT_IPK=$(BUILD_DIR)/libxslt_$(LIBXSLT_VERSION)-$(LIBXSLT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    153153# 
    154154$(LIBXSLT_IPK): $(LIBXSLT_BUILD_DIR)/.built 
    155         rm -rf $(LIBXSLT_IPK_DIR) $(BUILD_DIR)/libxslt_*_armeb.ipk 
     155        rm -rf $(LIBXSLT_IPK_DIR) $(BUILD_DIR)/libxslt_*_$(TARGET_ARCH).ipk 
    156156        $(MAKE) -C $(LIBXSLT_BUILD_DIR) DESTDIR=$(LIBXSLT_IPK_DIR) install 
    157157        rm $(LIBXSLT_IPK_DIR)/opt/lib/libxslt.la 
  • trunk/make/logrotate.mk

    r661 r1327  
    5151LOGROTATE_SOURCE_DIR=$(SOURCE_DIR)/logrotate 
    5252LOGROTATE_IPK_DIR=$(BUILD_DIR)/logrotate-$(LOGROTATE_VERSION)-ipk 
    53 LOGROTATE_IPK=$(BUILD_DIR)/logrotate_$(LOGROTATE_VERSION)-$(LOGROTATE_IPK_VERSION)_armeb.ipk 
     53LOGROTATE_IPK=$(BUILD_DIR)/logrotate_$(LOGROTATE_VERSION)-$(LOGROTATE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5454 
    5555# 
     
    122122# 
    123123$(LOGROTATE_IPK): $(LOGROTATE_BUILD_DIR)/.built 
    124         rm -rf $(LOGROTATE_IPK_DIR) $(BUILD_DIR)/logrotate_*_armeb.ipk 
     124        rm -rf $(LOGROTATE_IPK_DIR) $(BUILD_DIR)/logrotate_*_$(TARGET_ARCH).ipk 
    125125        install -d $(LOGROTATE_IPK_DIR)/opt/sbin 
    126126        $(STRIP_COMMAND) $(LOGROTATE_BUILD_DIR)/logrotate -o $(LOGROTATE_IPK_DIR)/opt/sbin/logrotate 
  • trunk/make/lsof.mk

    r1237 r1327  
    1414LSOF_SOURCE:=$(LSOF_FILE).tar.gz 
    1515LSOF_IPK_VERSION=1 
    16 LSOF_IPK:=$(BUILD_DIR)/lsof_$(LSOF_VERSION)-$(LSOF_IPK_VERSION)_armeb.ipk 
     16LSOF_IPK:=$(BUILD_DIR)/lsof_$(LSOF_VERSION)-$(LSOF_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1717LSOF_IPK_DIR:=$(BUILD_DIR)/lsof-$(LSOF_VERSION)-ipk 
    1818LSOF_PATCH:=$(LSOF_SOURCE_DIR)/Makefile-lib.patch 
     
    5151 
    5252$(LSOF_IPK): $(LSOF_DIR)/lsof 
    53         rm -rf $(LSOF_IPK_DIR) $(BUILD_DIR)/lsof_*_armeb.ipk 
     53        rm -rf $(LSOF_IPK_DIR) $(BUILD_DIR)/lsof_*_$(TARGET_ARCH).ipk 
    5454        install -d $(LSOF_IPK_DIR)/CONTROL 
    5555        install -d $(LSOF_IPK_DIR)/opt/sbin 
  • trunk/make/lynx.mk

    r1313 r1327  
    1818LYNX_SOURCE_DIR=$(SOURCE_DIR)/lynx 
    1919LYNX_IPK_DIR=$(BUILD_DIR)/lynx-$(LYNX_VERSION)-ipk 
    20 LYNX_IPK=$(BUILD_DIR)/lynx_$(LYNX_VERSION)-$(LYNX_IPK_VERSION)_armeb.ipk 
     20LYNX_IPK=$(BUILD_DIR)/lynx_$(LYNX_VERSION)-$(LYNX_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(LYNX_SOURCE): 
     
    6161 
    6262$(LYNX_IPK): $(LYNX_BUILD_DIR)/.built 
    63         rm -rf $(LYNX_IPK_DIR) $(BUILD_DIR)/lynx_*_armeb.ipk 
     63        rm -rf $(LYNX_IPK_DIR) $(BUILD_DIR)/lynx_*_$(TARGET_ARCH).ipk 
    6464        $(MAKE) -j1 -C $(LYNX_BUILD_DIR) DESTDIR=$(LYNX_IPK_DIR) install 
    6565        $(STRIP_COMMAND) $(LYNX_IPK_DIR)/opt/bin/* 
  • trunk/make/lzo.mk

    r906 r1327  
    6060LZO_SOURCE_DIR=$(SOURCE_DIR)/lzo 
    6161LZO_IPK_DIR=$(BUILD_DIR)/lzo-$(LZO_VERSION)-ipk 
    62 LZO_IPK=$(BUILD_DIR)/lzo_$(LZO_VERSION)-$(LZO_IPK_VERSION)_armeb.ipk 
     62LZO_IPK=$(BUILD_DIR)/lzo_$(LZO_VERSION)-$(LZO_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    164164# 
    165165$(LZO_IPK): $(LZO_BUILD_DIR)/.built 
    166         rm -rf $(LZO_IPK_DIR) $(BUILD_DIR)/lzo_*_armeb.ipk 
     166        rm -rf $(LZO_IPK_DIR) $(BUILD_DIR)/lzo_*_$(TARGET_ARCH).ipk 
    167167#       install -d $(LZO_IPK_DIR)/opt/bin 
    168168#       $(STRIP_COMMAND) $(LZO_BUILD_DIR)/lzo -o $(LZO_IPK_DIR)/opt/bin/lzo 
  • trunk/make/m4.mk

    r661 r1327  
    5656M4_SOURCE_DIR=$(SOURCE_DIR)/m4 
    5757M4_IPK_DIR=$(BUILD_DIR)/m4-$(M4_VERSION)-ipk 
    58 M4_IPK=$(BUILD_DIR)/m4_$(M4_VERSION)-$(M4_IPK_VERSION)_armeb.ipk 
     58M4_IPK=$(BUILD_DIR)/m4_$(M4_VERSION)-$(M4_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/madplay.mk

    r1253 r1327  
    6060MADPLAY_SOURCE_DIR=$(SOURCE_DIR)/madplay 
    6161MADPLAY_IPK_DIR=$(BUILD_DIR)/madplay-$(MADPLAY_VERSION)-ipk 
    62 MADPLAY_IPK=$(BUILD_DIR)/madplay_$(MADPLAY_VERSION)-$(MADPLAY_IPK_VERSION)_armeb.ipk 
     62MADPLAY_IPK=$(BUILD_DIR)/madplay_$(MADPLAY_VERSION)-$(MADPLAY_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(MADPLAY_IPK): $(MADPLAY_BUILD_DIR)/.built 
    150         rm -rf $(MADPLAY_IPK_DIR) $(BUILD_DIR)/madplay_*_armeb.ipk 
     150        rm -rf $(MADPLAY_IPK_DIR) $(BUILD_DIR)/madplay_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(MADPLAY_BUILD_DIR) DESTDIR=$(MADPLAY_IPK_DIR) install 
    152152        install -d $(MADPLAY_IPK_DIR)/CONTROL 
    153         install -m 644 $(MADPLAY_SOURCE_DIR)/control $(MADPLAY_IPK_DIR)/CONTROL/control 
     153        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(MADPLAY_VERSION)/" \ 
     154                -e "s/@RELEASE@/$(MADPLAY_IPK_VERSION)/" $(MADPLAY_SOURCE_DIR)/control > $(MADPLAY_IPK_DIR)/CONTROL/control 
    154155        echo $(MADPLAY_CONFFILES) | sed -e 's/ /\n/g' > $(MADPLAY_IPK_DIR)/CONTROL/conffiles 
    155156        cd $(BUILD_DIR); $(IPKG_BUILD) $(MADPLAY_IPK_DIR) 
  • trunk/make/make.mk

    r661 r1327  
    5656MAKE_SOURCE_DIR=$(SOURCE_DIR)/make 
    5757MAKE_IPK_DIR=$(BUILD_DIR)/make-$(MAKE_VERSION)-ipk 
    58 MAKE_IPK=$(BUILD_DIR)/make_$(MAKE_VERSION)-$(MAKE_IPK_VERSION)_armeb.ipk 
     58MAKE_IPK=$(BUILD_DIR)/make_$(MAKE_VERSION)-$(MAKE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/man-pages.mk

    r872 r1327  
    5555MAN_PAGES_SOURCE_DIR=$(SOURCE_DIR)/man-pages 
    5656MAN_PAGES_IPK_DIR=$(BUILD_DIR)/man-pages-$(MAN_PAGES_VERSION)-ipk 
    57 MAN_PAGES_IPK=$(BUILD_DIR)/man-pages_$(MAN_PAGES_VERSION)-$(MAN_PAGES_IPK_VERSION)_armeb.ipk 
     57MAN_PAGES_IPK=$(BUILD_DIR)/man-pages_$(MAN_PAGES_VERSION)-$(MAN_PAGES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    143143# 
    144144$(MAN_PAGES_IPK): $(MAN_PAGES_BUILD_DIR)/.built 
    145         rm -rf $(MAN_PAGES_IPK_DIR) $(BUILD_DIR)/man-pages_*_armeb.ipk 
     145        rm -rf $(MAN_PAGES_IPK_DIR) $(BUILD_DIR)/man-pages_*_$(TARGET_ARCH).ipk 
    146146        $(MAKE) -C $(MAN_PAGES_BUILD_DIR) MANDIR=$(MAN_PAGES_IPK_DIR)/opt/man install 
    147147#       install -d $(MAN_PAGES_IPK_DIR)/opt/etc/ 
  • trunk/make/man.mk

    r1053 r1327  
    5555MAN_SOURCE_DIR=$(SOURCE_DIR)/man 
    5656MAN_IPK_DIR=$(BUILD_DIR)/man-$(MAN_VERSION)-ipk 
    57 MAN_IPK=$(BUILD_DIR)/man_$(MAN_VERSION)-$(MAN_IPK_VERSION)_armeb.ipk 
     57MAN_IPK=$(BUILD_DIR)/man_$(MAN_VERSION)-$(MAN_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    141141# 
    142142$(MAN_IPK): $(MAN_BUILD_DIR)/.built 
    143         rm -rf $(MAN_IPK_DIR) $(BUILD_DIR)/man_*_armeb.ipk 
     143        rm -rf $(MAN_IPK_DIR) $(BUILD_DIR)/man_*_$(TARGET_ARCH).ipk 
    144144        $(MAKE) -C $(MAN_BUILD_DIR) DESTDIR=$(MAN_IPK_DIR) install 
    145145        install -d $(MAN_IPK_DIR)/opt/etc/ 
  • trunk/make/mc.mk

    r661 r1327  
    4141MC_SOURCE_DIR=$(SOURCE_DIR)/mc 
    4242MC_IPK_DIR=$(BUILD_DIR)/mc-$(MC_VERSION)-ipk 
    43 MC_IPK=$(BUILD_DIR)/mc_$(MC_VERSION)-$(MC_IPK_VERSION)_armeb.ipk 
     43MC_IPK=$(BUILD_DIR)/mc_$(MC_VERSION)-$(MC_IPK_VERSION)_$(TARGET_ARCH).ipk 
    4444 
    4545# 
  • trunk/make/mdadm.mk

    r661 r1327  
    5656MDADM_SOURCE_DIR=$(SOURCE_DIR)/mdadm 
    5757MDADM_IPK_DIR=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)-ipk 
    58 MDADM_IPK=$(BUILD_DIR)/mdadm_$(MDADM_VERSION)-$(MDADM_IPK_VERSION)_armeb.ipk 
     58MDADM_IPK=$(BUILD_DIR)/mdadm_$(MDADM_VERSION)-$(MDADM_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/metalog.mk

    r1087 r1327  
    6060METALOG_SOURCE_DIR=$(SOURCE_DIR)/metalog 
    6161METALOG_IPK_DIR=$(BUILD_DIR)/metalog-$(METALOG_VERSION)-ipk 
    62 METALOG_IPK=$(BUILD_DIR)/metalog_$(METALOG_VERSION)-$(METALOG_IPK_VERSION)_armeb.ipk 
     62METALOG_IPK=$(BUILD_DIR)/metalog_$(METALOG_VERSION)-$(METALOG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    148148# 
    149149$(METALOG_IPK): $(METALOG_BUILD_DIR)/.built 
    150         rm -rf $(METALOG_IPK_DIR) $(BUILD_DIR)/metalog_*_armeb.ipk 
     150        rm -rf $(METALOG_IPK_DIR) $(BUILD_DIR)/metalog_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(METALOG_BUILD_DIR) DESTDIR=$(METALOG_IPK_DIR) install 
    152152        $(MAKE) -C $(METALOG_BUILD_DIR) DESTDIR=$(METALOG_IPK_DIR) install-man 
  • trunk/make/miau.mk

    r969 r1327  
    2525MIAU_SOURCE_DIR=$(SOURCE_DIR)/miau 
    2626MIAU_IPK_DIR=$(BUILD_DIR)/miau-$(MIAU_VERSION)-ipk 
    27 MIAU_IPK=$(BUILD_DIR)/miau_$(MIAU_VERSION)-$(MIAU_IPK_VERSION)_armeb.ipk 
     27MIAU_IPK=$(BUILD_DIR)/miau_$(MIAU_VERSION)-$(MIAU_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2828 
    2929$(DL_DIR)/$(MIAU_SOURCE): 
     
    6969 
    7070$(MIAU_IPK): $(MIAU_BUILD_DIR)/src/miau 
    71         rm -rf $(MIAU_IPK_DIR) $(BUILD_DIR)/miau_*_armeb.ipk 
     71        rm -rf $(MIAU_IPK_DIR) $(BUILD_DIR)/miau_*_$(TARGET_ARCH).ipk 
    7272        install -d $(MIAU_IPK_DIR)/opt/bin 
    7373        $(STRIP_COMMAND) $(MIAU_BUILD_DIR)/src/miau -o $(MIAU_IPK_DIR)/opt/bin/miau 
  • trunk/make/mpc.mk

    r1258 r1327  
    6060MPC_SOURCE_DIR=$(SOURCE_DIR)/mpc 
    6161MPC_IPK_DIR=$(BUILD_DIR)/mpc-$(MPC_VERSION)-ipk 
    62 MPC_IPK=$(BUILD_DIR)/mpc_$(MPC_VERSION)-$(MPC_IPK_VERSION)_armeb.ipk 
     62MPC_IPK=$(BUILD_DIR)/mpc_$(MPC_VERSION)-$(MPC_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    147147# 
    148148$(MPC_IPK): $(MPC_BUILD_DIR)/.built 
    149         rm -rf $(MPC_IPK_DIR) $(BUILD_DIR)/mpc_*_armeb.ipk 
     149        rm -rf $(MPC_IPK_DIR) $(BUILD_DIR)/mpc_*_$(TARGET_ARCH).ipk 
    150150        $(MAKE) -C $(MPC_BUILD_DIR) DESTDIR=$(MPC_IPK_DIR) install 
    151151        install -d $(MPC_IPK_DIR)/CONTROL 
  • trunk/make/mpd.mk

    r1257 r1327  
    6060MPD_SOURCE_DIR=$(SOURCE_DIR)/mpd 
    6161MPD_IPK_DIR=$(BUILD_DIR)/mpd-$(MPD_VERSION)-ipk 
    62 MPD_IPK=$(BUILD_DIR)/mpd_$(MPD_VERSION)-$(MPD_IPK_VERSION)_armeb.ipk 
     62MPD_IPK=$(BUILD_DIR)/mpd_$(MPD_VERSION)-$(MPD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    168168# 
    169169$(MPD_IPK): $(MPD_BUILD_DIR)/.built 
    170         rm -rf $(MPD_IPK_DIR) $(BUILD_DIR)/mpd_*_armeb.ipk 
     170        rm -rf $(MPD_IPK_DIR) $(BUILD_DIR)/mpd_*_$(TARGET_ARCH).ipk 
    171171        $(MAKE) -C $(MPD_BUILD_DIR) DESTDIR=$(MPD_IPK_DIR) install 
    172172        install -d $(MPD_IPK_DIR)/opt/etc/ 
  • trunk/make/mt-daapd.mk

    r1148 r1327  
    2121MT_DAAPD_SOURCE_DIR=$(SOURCE_DIR)/mt-daapd 
    2222MT_DAAPD_IPK_DIR=$(BUILD_DIR)/mt-daapd-$(MT_DAAPD_VERSION)-ipk 
    23 MT_DAAPD_IPK=$(BUILD_DIR)/mt-daapd_$(MT_DAAPD_VERSION)-$(MT_DAAPD_IPK_VERSION)_armeb.ipk 
     23MT_DAAPD_IPK=$(BUILD_DIR)/mt-daapd_$(MT_DAAPD_VERSION)-$(MT_DAAPD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2424 
    2525$(DL_DIR)/$(MT_DAAPD_SOURCE): 
     
    6161 
    6262$(MT_DAAPD_IPK): $(MT_DAAPD_BUILD_DIR)/src/mt-daapd 
    63         rm -rf $(MT_DAAPD_IPK_DIR) $(BUILD_DIR)/mt-daapd_*_armeb.ipk 
     63        rm -rf $(MT_DAAPD_IPK_DIR) $(BUILD_DIR)/mt-daapd_*_$(TARGET_ARCH).ipk 
    6464        install -d $(MT_DAAPD_IPK_DIR)/opt/sbin 
    6565        $(STRIP_COMMAND) $(MT_DAAPD_BUILD_DIR)/src/mt-daapd -o $(MT_DAAPD_IPK_DIR)/opt/sbin/mt-daapd 
  • trunk/make/mtr.mk

    r861 r1327  
    5656MTR_SOURCE_DIR=$(SOURCE_DIR)/mtr 
    5757MTR_IPK_DIR=$(BUILD_DIR)/mtr-$(MTR_VERSION)-ipk 
    58 MTR_IPK=$(BUILD_DIR)/mtr_$(MTR_VERSION)-$(MTR_IPK_VERSION)_armeb.ipk 
     58MTR_IPK=$(BUILD_DIR)/mtr_$(MTR_VERSION)-$(MTR_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    148148# 
    149149$(MTR_IPK): $(MTR_BUILD_DIR)/.built 
    150         rm -rf $(MTR_IPK_DIR) $(BUILD_DIR)/mtr_*_armeb.ipk 
     150        rm -rf $(MTR_IPK_DIR) $(BUILD_DIR)/mtr_*_$(TARGET_ARCH).ipk 
    151151        $(MAKE) -C $(MTR_BUILD_DIR) DESTDIR=$(MTR_IPK_DIR) install 
    152152#       install -d $(MTR_IPK_DIR)/opt/etc/ 
  • trunk/make/mutt.mk

    r1044 r1327  
    5555MUTT_SOURCE_DIR=$(SOURCE_DIR)/mutt 
    5656MUTT_IPK_DIR=$(BUILD_DIR)/mutt-$(MUTT_VERSION)-ipk 
    57 MUTT_IPK=$(BUILD_DIR)/mutt_$(MUTT_VERSION)-$(MUTT_IPK_VERSION)_armeb.ipk 
     57MUTT_IPK=$(BUILD_DIR)/mutt_$(MUTT_VERSION)-$(MUTT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    153153# 
    154154$(MUTT_IPK): $(MUTT_BUILD_DIR)/.built 
    155         rm -rf $(MUTT_IPK_DIR) $(BUILD_DIR)/mutt_*_armeb.ipk 
     155        rm -rf $(MUTT_IPK_DIR) $(BUILD_DIR)/mutt_*_$(TARGET_ARCH).ipk 
    156156        $(MAKE) -C $(MUTT_BUILD_DIR) DESTDIR=$(MUTT_IPK_DIR) install 
    157157        # install-strip doesn't work for some reason 
  • trunk/make/mysql.mk

    r661 r1327  
    1212MYSQL_SOURCE:=$(MYSQL).tar.gz 
    1313MYSQL_UNZIP=zcat 
    14 MYSQL_IPK=$(BUILD_DIR)/mysql_$(MYSQL_VERSION)-1_armeb.ipk 
     14MYSQL_IPK=$(BUILD_DIR)/mysql_$(MYSQL_VERSION)-1_$(TARGET_ARCH).ipk 
    1515MYSQL_IPK_DIR:=$(BUILD_DIR)/mysql-$(MYSQL_VERSION)-ipk 
    1616MYSQL_PATCH=$(SOURCE_DIR)/mysql.patch 
  • trunk/make/nail.mk

    r661 r1327  
    5656NAIL_SOURCE_DIR=$(SOURCE_DIR)/nail 
    5757NAIL_IPK_DIR=$(BUILD_DIR)/nail-$(NAIL_VERSION)-ipk 
    58 NAIL_IPK=$(BUILD_DIR)/nail_$(NAIL_VERSION)-$(NAIL_IPK_VERSION)_armeb.ipk 
     58NAIL_IPK=$(BUILD_DIR)/nail_$(NAIL_VERSION)-$(NAIL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    147147# 
    148148$(NAIL_IPK): $(NAIL_BUILD_DIR)/.built 
    149         rm -rf $(NAIL_IPK_DIR) $(BUILD_DIR)/nail_*_armeb.ipk 
     149        rm -rf $(NAIL_IPK_DIR) $(BUILD_DIR)/nail_*_$(TARGET_ARCH).ipk 
    150150        install -d $(NAIL_IPK_DIR)/opt/bin 
    151151        install -d $(NAIL_IPK_DIR)/opt/doc/nail 
  • trunk/make/nano.mk

    r739 r1327  
    4949NANO_SOURCE_DIR=$(SOURCE_DIR)/nano 
    5050NANO_IPK_DIR=$(BUILD_DIR)/nano-$(NANO_VERSION)-ipk 
    51 NANO_IPK=$(BUILD_DIR)/nano_$(NANO_VERSION)-$(NANO_IPK_VERSION)_armeb.ipk 
     51NANO_IPK=$(BUILD_DIR)/nano_$(NANO_VERSION)-$(NANO_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5252 
    5353# 
  • trunk/make/ncftp.mk

    r1024 r1327  
    6161NCFTP_SOURCE_DIR=$(SOURCE_DIR)/ncftp 
    6262NCFTP_IPK_DIR=$(BUILD_DIR)/ncftp-$(NCFTP_VERSION)-ipk 
    63 NCFTP_IPK=$(BUILD_DIR)/ncftp_$(NCFTP_VERSION)-$(NCFTP_IPK_VERSION)_armeb.ipk 
     63NCFTP_IPK=$(BUILD_DIR)/ncftp_$(NCFTP_VERSION)-$(NCFTP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6464 
    6565# 
     
    159159# 
    160160$(NCFTP_IPK): $(NCFTP_BUILD_DIR)/.built 
    161         rm -rf $(NCFTP_IPK_DIR) $(BUILD_DIR)/ncftp_*_armeb.ipk 
     161        rm -rf $(NCFTP_IPK_DIR) $(BUILD_DIR)/ncftp_*_$(TARGET_ARCH).ipk 
    162162        install -d $(NCFTP_IPK_DIR)/opt/bin 
    163163        $(MAKE) -C $(NCFTP_BUILD_DIR) BINDIR=$(NCFTP_IPK_DIR)/opt/bin \ 
  • trunk/make/ncurses.mk

    r1237 r1327  
    1616NCURSES_IPK_VERSION=2 
    1717 
    18 NCURSES_IPK=$(BUILD_DIR)/ncurses_$(NCURSES_VERSION)-$(NCURSES_IPK_VERSION)_armeb.ipk 
     18NCURSES_IPK=$(BUILD_DIR)/ncurses_$(NCURSES_VERSION)-$(NCURSES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1919NCURSES_IPK_DIR=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)-ipk 
    2020 
     
    6161 
    6262$(NCURSES_IPK): $(STAGING_DIR)/opt/lib/libncurses.so.$(NCURSES_SHLIBVERSION) 
    63         rm -rf $(NCURSES_IPK_DIR) $(BUILD_DIR)/ncurses_*_armeb.ipk 
     63        rm -rf $(NCURSES_IPK_DIR) $(BUILD_DIR)/ncurses_*_$(TARGET_ARCH).ipk 
    6464        mkdir -p $(NCURSES_IPK_DIR)/CONTROL 
    6565        cp $(SOURCE_DIR)/ncurses.control $(NCURSES_IPK_DIR)/CONTROL/control 
  • trunk/make/netatalk.mk

    r398 r1327  
    5656NETATALK_SOURCE_DIR=$(SOURCE_DIR)/netatalk 
    5757NETATALK_IPK_DIR=$(BUILD_DIR)/netatalk-$(NETATALK_VERSION)-ipk 
    58 NETATALK_IPK=$(BUILD_DIR)/netatalk_$(NETATALK_VERSION)-$(NETATALK_IPK_VERSION)_armeb.ipk 
     58NETATALK_IPK=$(BUILD_DIR)/netatalk_$(NETATALK_VERSION)-$(NETATALK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/nethack.mk

    r307 r1327  
    5555NETHACK_SOURCE_DIR=$(SOURCE_DIR)/nethack 
    5656NETHACK_IPK_DIR=$(BUILD_DIR)/nethack-$(NETHACK_VERSION)-ipk 
    57 NETHACK_IPK=$(BUILD_DIR)/nethack_$(NETHACK_VERSION)-$(NETHACK_IPK_VERSION)_armeb.ipk 
     57NETHACK_IPK=$(BUILD_DIR)/nethack_$(NETHACK_VERSION)-$(NETHACK_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
  • trunk/make/netpbm.mk

    r661 r1327  
    5656NETPBM_SOURCE_DIR=$(SOURCE_DIR)/netpbm 
    5757NETPBM_IPK_DIR=$(BUILD_DIR)/netpbm-$(NETPBM_VERSION)-ipk 
    58 NETPBM_IPK=$(BUILD_DIR)/netpbm_$(NETPBM_VERSION)-$(NETPBM_IPK_VERSION)_armeb.ipk 
     58NETPBM_IPK=$(BUILD_DIR)/netpbm_$(NETPBM_VERSION)-$(NETPBM_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/nfs-server.mk

    r661 r1327  
    5656NFS_SERVER_SOURCE_DIR=$(SOURCE_DIR)/nfs-server 
    5757NFS_SERVER_IPK_DIR=$(BUILD_DIR)/nfs-server-$(NFS_SERVER_VERSION)-ipk 
    58 NFS_SERVER_IPK=$(BUILD_DIR)/nfs-server_$(NFS_SERVER_VERSION)-$(NFS_SERVER_IPK_VERSION)_armeb.ipk 
     58NFS_SERVER_IPK=$(BUILD_DIR)/nfs-server_$(NFS_SERVER_VERSION)-$(NFS_SERVER_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/nfs-utils.mk

    r661 r1327  
    5252NFS-UTILS_SOURCE_DIR=$(SOURCE_DIR)/nfs-utils 
    5353NFS-UTILS_IPK_DIR=$(BUILD_DIR)/nfs-utils-$(NFS-UTILS_VERSION)-ipk 
    54 NFS-UTILS_IPK=$(BUILD_DIR)/nfs-utils_$(NFS-UTILS_VERSION)-$(NFS-UTILS_IPK_VERSION)_armeb.ipk 
     54NFS-UTILS_IPK=$(BUILD_DIR)/nfs-utils_$(NFS-UTILS_VERSION)-$(NFS-UTILS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5555 
    5656# 
     
    132132# 
    133133$(NFS-UTILS_IPK): $(NFS-UTILS_BUILD_DIR)/.built 
    134         rm -rf $(NFS-UTILS_IPK_DIR) $(BUILD_DIR)/nfs-utils_*_armeb.ipk 
     134        rm -rf $(NFS-UTILS_IPK_DIR) $(BUILD_DIR)/nfs-utils_*_$(TARGET_ARCH).ipk 
    135135        install -d $(NFS-UTILS_IPK_DIR)/opt/sbin 
    136136        $(STRIP_COMMAND) $(NFS-UTILS_BUILD_DIR)/utils/nfsd/nfsd -o $(NFS-UTILS_IPK_DIR)/opt/sbin/nfsd 
  • trunk/make/nload.mk

    r901 r1327  
    5656NLOAD_SOURCE_DIR=$(SOURCE_DIR)/nload 
    5757NLOAD_IPK_DIR=$(BUILD_DIR)/nload-$(NLOAD_VERSION)-ipk 
    58 NLOAD_IPK=$(BUILD_DIR)/nload_$(NLOAD_VERSION)-$(NLOAD_IPK_VERSION)_armeb.ipk 
     58NLOAD_IPK=$(BUILD_DIR)/nload_$(NLOAD_VERSION)-$(NLOAD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    149149# 
    150150$(NLOAD_IPK): $(NLOAD_BUILD_DIR)/.built 
    151         rm -rf $(NLOAD_IPK_DIR) $(BUILD_DIR)/nload_*_armeb.ipk 
     151        rm -rf $(NLOAD_IPK_DIR) $(BUILD_DIR)/nload_*_$(TARGET_ARCH).ipk 
    152152        install -d $(NLOAD_IPK_DIR)/opt/bin 
    153153        $(STRIP_COMMAND) $(NLOAD_BUILD_DIR)/src/nload -o $(NLOAD_IPK_DIR)/opt/bin/nload 
  • trunk/make/nmap.mk

    r661 r1327  
    5757NMAP_SOURCE_DIR=$(SOURCE_DIR)/nmap 
    5858NMAP_IPK_DIR=$(BUILD_DIR)/nmap-$(NMAP_VERSION)-ipk 
    59 NMAP_IPK=$(BUILD_DIR)/nmap_$(NMAP_VERSION)-$(NMAP_IPK_VERSION)_armeb.ipk 
     59NMAP_IPK=$(BUILD_DIR)/nmap_$(NMAP_VERSION)-$(NMAP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6060 
    6161# 
     
    155155# 
    156156$(NMAP_IPK): $(NMAP_BUILD_DIR)/.built 
    157         rm -rf $(NMAP_IPK_DIR) $(BUILD_DIR)/nmap_*_armeb.ipk 
     157        rm -rf $(NMAP_IPK_DIR) $(BUILD_DIR)/nmap_*_$(TARGET_ARCH).ipk 
    158158        install -d $(NMAP_IPK_DIR)/opt/bin 
    159159        $(STRIP_COMMAND) $(NMAP_BUILD_DIR)/nmap -o $(NMAP_IPK_DIR)/opt/bin/nmap 
  • trunk/make/ntop.mk

    r1305 r1327  
    7676NTOP_SOURCE_DIR=$(SOURCE_DIR)/ntop 
    7777NTOP_IPK_DIR=$(BUILD_DIR)/ntop-$(NTOP_VERSION)-ipk 
    78 NTOP_IPK=$(BUILD_DIR)/ntop_$(NTOP_VERSION)-$(NTOP_IPK_VERSION)_armeb.ipk 
     78NTOP_IPK=$(BUILD_DIR)/ntop_$(NTOP_VERSION)-$(NTOP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    7979 
    8080 
     
    8686        @rm -f $@ 
    8787        @echo "Package: $(NTOP_NAME)" >>$@ 
    88         @echo "Architecture: armeb" >>$@ 
     88        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    8989        @echo "Priority: $(NTOP_PRIORITY)" >>$@ 
    9090        @echo "Section: $(NTOP_SECTION)" >>$@ 
     
    194194# 
    195195$(NTOP_IPK): $(NTOP_BUILD_DIR)/.built 
    196         rm -rf $(NTOP_IPK_DIR) $(BUILD_DIR)/ntop_*_armeb.ipk 
     196        rm -rf $(NTOP_IPK_DIR) $(BUILD_DIR)/ntop_*_$(TARGET_ARCH).ipk 
    197197        $(MAKE) -C $(NTOP_BUILD_DIR) DESTDIR=$(NTOP_IPK_DIR) install-strip 
    198198        install -d $(NTOP_IPK_DIR)/opt/etc/ 
  • trunk/make/ntp.mk

    r661 r1327  
    5656NTP_SOURCE_DIR=$(SOURCE_DIR)/ntp 
    5757NTP_IPK_DIR=$(BUILD_DIR)/ntp-$(NTP_VERSION)-ipk 
    58 NTP_IPK=$(BUILD_DIR)/ntp_$(NTP_VERSION)-$(NTP_IPK_VERSION)_armeb.ipk 
     58NTP_IPK=$(BUILD_DIR)/ntp_$(NTP_VERSION)-$(NTP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/ntpclient.mk

    r739 r1327  
    2020NTPCLIENT_SOURCE_DIR=$(SOURCE_DIR)/ntpclient 
    2121NTPCLIENT_IPK_DIR=$(BUILD_DIR)/ntpclient-$(NTPCLIENT_VERSION)-ipk 
    22 NTPCLIENT_IPK=$(BUILD_DIR)/ntpclient_$(NTPCLIENT_VERSION)-$(NTPCLIENT_IPK_VERSION)_armeb.ipk 
     22NTPCLIENT_IPK=$(BUILD_DIR)/ntpclient_$(NTPCLIENT_VERSION)-$(NTPCLIENT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2323 
    2424$(DL_DIR)/$(NTPCLIENT_SOURCE): 
  • trunk/make/ntppatches.mk

    r430 r1327  
    1818NTPPATCHES_SOURCE_DIR=$(SOURCE_DIR)/ntppatches 
    1919NTPPATCHES_IPK_DIR:=$(BUILD_DIR)/ntppatches-$(NTPPATCHES_VERSION)-ipk 
    20 NTPPATCHES_IPK=$(BUILD_DIR)/ntppatches_$(NTPPATCHES_VERSION)-$(NTPPATCHES_IPK_VERSION)_armeb.ipk 
     20NTPPATCHES_IPK=$(BUILD_DIR)/ntppatches_$(NTPPATCHES_VERSION)-$(NTPPATCHES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222# Kit requires a "source" tarball -- even though this package is self-contained 
  • trunk/make/openldap.mk

    r1234 r1327  
    6060OPENLDAP_SOURCE_DIR=$(SOURCE_DIR)/openldap 
    6161OPENLDAP_IPK_DIR=$(BUILD_DIR)/openldap-$(OPENLDAP_VERSION)-ipk 
    62 OPENLDAP_IPK=$(BUILD_DIR)/openldap_$(OPENLDAP_VERSION)-$(OPENLDAP_IPK_VERSION)_armeb.ipk 
     62OPENLDAP_IPK=$(BUILD_DIR)/openldap_$(OPENLDAP_VERSION)-$(OPENLDAP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    153153# 
    154154$(OPENLDAP_IPK): $(OPENLDAP_BUILD_DIR)/.built 
    155         rm -rf $(OPENLDAP_IPK_DIR) $(BUILD_DIR)/openldap_*_armeb.ipk 
     155        rm -rf $(OPENLDAP_IPK_DIR) $(BUILD_DIR)/openldap_*_$(TARGET_ARCH).ipk 
    156156        $(MAKE) -C $(OPENLDAP_BUILD_DIR) DESTDIR=$(OPENLDAP_IPK_DIR) install 
    157157        install -d $(OPENLDAP_IPK_DIR)/opt/etc/ 
  • trunk/make/openssh.mk

    r1125 r1327  
    1919OPENSSH_SOURCE_DIR=$(SOURCE_DIR)/openssh 
    2020OPENSSH_IPK_DIR:=$(BUILD_DIR)/openssh-$(OPENSSH_VERSION)-ipk 
    21 OPENSSH_IPK=$(BUILD_DIR)/openssh_$(OPENSSH_VERSION)-$(OPENSSH_IPK_VERSION)_armeb.ipk 
     21OPENSSH_IPK=$(BUILD_DIR)/openssh_$(OPENSSH_VERSION)-$(OPENSSH_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2222 
    2323$(DL_DIR)/$(OPENSSH_SOURCE): 
     
    7474 
    7575$(OPENSSH_IPK): $(OPENSSH_BUILD_DIR)/ssh 
    76         rm -rf $(OPENSSH_IPK_DIR) $(BUILD_DIR)/openssh_*_armeb.ipk 
     76        rm -rf $(OPENSSH_IPK_DIR) $(BUILD_DIR)/openssh_*_$(TARGET_ARCH).ipk 
    7777        $(MAKE) DESTDIR=$(OPENSSH_IPK_DIR) -C $(OPENSSH_BUILD_DIR) install-files 
    7878        rm -rf $(OPENSSH_IPK_DIR)/opt/share 
  • trunk/make/openssl.mk

    r880 r1327  
    1515OPENSSL_SOURCE_DIR=$(SOURCE_DIR)/openssl 
    1616OPENSSL_IPK_DIR=$(BUILD_DIR)/openssl-$(OPENSSL_VERSION)-ipk 
    17 OPENSSL_IPK=$(BUILD_DIR)/openssl_$(OPENSSL_VERSION)-$(OPENSSL_IPK_VERSION)_armeb.ipk 
     17OPENSSL_IPK=$(BUILD_DIR)/openssl_$(OPENSSL_VERSION)-$(OPENSSL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1818 
    1919OPENSSL_PATCHES=$(OPENSSL_SOURCE_DIR)/Configure.patch 
     
    3636                        --openssldir=/opt/share/openssl \ 
    3737                        --prefix=/opt \ 
    38                         linux-elf-armeb
     38                        linux-elf-$(TARGET_ARCH)
    3939        ) 
    4040        touch $(OPENSSL_BUILD_DIR)/.configured 
     
    7070 
    7171$(OPENSSL_IPK): $(OPENSSL_BUILD_DIR)/libssl.so.$(OPENSSL_LIB_VERSION) 
    72         rm -rf $(OPENSSL_IPK_DIR) $(BUILD_DIR)/openssl_*_armeb.ipk 
     72        rm -rf $(OPENSSL_IPK_DIR) $(BUILD_DIR)/openssl_*_$(TARGET_ARCH).ipk 
    7373        install -d $(OPENSSL_IPK_DIR)/opt/bin 
    7474        install -m 755 $(OPENSSL_BUILD_DIR)/apps/openssl $(OPENSSL_IPK_DIR)/opt/bin/openssl 
    75         $(STRIP_COMMAND) $(OPENSSL_IPK_DIR)/opt/bin/opensl
     75        $(STRIP_COMMAND) $(OPENSSL_IPK_DIR)/opt/bin/openss
    7676        install -d $(OPENSSL_IPK_DIR)/opt/share/openssl 
    7777        install -m 755 $(OPENSSL_BUILD_DIR)/apps/openssl.cnf $(OPENSSL_IPK_DIR)/opt/share/openssl/openssl.cnf 
     
    8888        cd $(OPENSSL_IPK_DIR)/opt/lib && ln -fs libssl.so.$(OPENSSL_LIB_VERSION) libssl.so 
    8989        install -d $(OPENSSL_IPK_DIR)/CONTROL 
    90         install -m 644 $(OPENSSL_SOURCE_DIR)/control $(OPENSSL_IPK_DIR)/CONTROL/control 
     90        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(OPENSSL_VERSION)/" \ 
     91                -e "s/@RELEASE@/$(OPENSSL_IPK_VERSION)/" $(OPENSSL_SOURCE_DIR)/control > $(OPENSSL_IPK_DIR)/CONTROL/control 
    9192        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSL_IPK_DIR) 
    9293 
  • trunk/make/pango.mk

    r1206 r1327  
    6363PANGO_SOURCE_DIR=$(SOURCE_DIR)/pango 
    6464PANGO_IPK_DIR=$(BUILD_DIR)/pango-$(PANGO_VERSION)-ipk 
    65 PANGO_IPK=$(BUILD_DIR)/pango_$(PANGO_VERSION)-$(PANGO_IPK_VERSION)_armeb.ipk 
     65PANGO_IPK=$(BUILD_DIR)/pango_$(PANGO_VERSION)-$(PANGO_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: pango" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(PANGO_PRIORITY)" >>$@ 
    7676        @echo "Section: $(PANGO_SECTION)" >>$@ 
     
    176176# 
    177177$(PANGO_IPK): $(PANGO_BUILD_DIR)/.built 
    178         rm -rf $(PANGO_IPK_DIR) $(BUILD_DIR)/pango_*_armeb.ipk 
     178        rm -rf $(PANGO_IPK_DIR) $(BUILD_DIR)/pango_*_$(TARGET_ARCH).ipk 
    179179        $(MAKE) -C $(PANGO_BUILD_DIR) DESTDIR=$(PANGO_IPK_DIR) install-strip 
    180180        rm -f $(PANGO_IPK_DIR)/opt/lib/*.la 
  • trunk/make/parted.mk

    r1168 r1327  
    6262PARTED_SOURCE_DIR=$(SOURCE_DIR)/parted 
    6363PARTED_IPK_DIR=$(BUILD_DIR)/parted-$(PARTED_VERSION)-ipk 
    64 PARTED_IPK=$(BUILD_DIR)/parted_$(PARTED_VERSION)-$(PARTED_IPK_VERSION)_armeb.ipk 
     64PARTED_IPK=$(BUILD_DIR)/parted_$(PARTED_VERSION)-$(PARTED_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6565 
    6666# 
     
    151151# 
    152152$(PARTED_IPK): $(PARTED_BUILD_DIR)/.built 
    153         rm -rf $(PARTED_IPK_DIR) $(BUILD_DIR)/parted_*_armeb.ipk 
     153        rm -rf $(PARTED_IPK_DIR) $(BUILD_DIR)/parted_*_$(TARGET_ARCH).ipk 
    154154        $(MAKE) -C $(PARTED_BUILD_DIR) DESTDIR=$(PARTED_IPK_DIR) install 
    155155#       install -d $(PARTED_IPK_DIR)/opt/etc/ 
  • trunk/make/patch.mk

    r661 r1327  
    5656PATCH_SOURCE_DIR=$(SOURCE_DIR)/patch 
    5757PATCH_IPK_DIR=$(BUILD_DIR)/patch-$(PATCH_VERSION)-ipk 
    58 PATCH_IPK=$(BUILD_DIR)/patch_$(PATCH_VERSION)-$(PATCH_IPK_VERSION)_armeb.ipk 
     58PATCH_IPK=$(BUILD_DIR)/patch_$(PATCH_VERSION)-$(PATCH_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    134134# 
    135135$(PATCH_IPK): $(PATCH_BUILD_DIR)/patch 
    136         rm -rf $(PATCH_IPK_DIR) $(BUILD_DIR)/patch_*_armeb.ipk 
     136        rm -rf $(PATCH_IPK_DIR) $(BUILD_DIR)/patch_*_$(TARGET_ARCH).ipk 
    137137        install -d $(PATCH_IPK_DIR)/opt/bin 
    138138        $(STRIP_COMMAND) $(PATCH_BUILD_DIR)/patch -o $(PATCH_IPK_DIR)/opt/bin/patch 
  • trunk/make/pcre.mk

    r944 r1327  
    6767PCRE_SOURCE_DIR=$(SOURCE_DIR)/pcre 
    6868PCRE_IPK_DIR=$(BUILD_DIR)/pcre-$(PCRE_VERSION)-ipk 
    69 PCRE_IPK=$(BUILD_DIR)/pcre_$(PCRE_VERSION)-$(PCRE_IPK_VERSION)_armeb.ipk 
     69PCRE_IPK=$(BUILD_DIR)/pcre_$(PCRE_VERSION)-$(PCRE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    7070 
    7171# 
     
    156156# 
    157157$(PCRE_IPK): $(PCRE_BUILD_DIR)/.built 
    158         rm -rf $(PCRE_IPK_DIR) $(BUILD_DIR)/pcre_*_armeb.ipk 
     158        rm -rf $(PCRE_IPK_DIR) $(BUILD_DIR)/pcre_*_$(TARGET_ARCH).ipk 
    159159        $(MAKE) -C $(PCRE_BUILD_DIR) DESTDIR=$(PCRE_IPK_DIR) install 
    160160        find $(PCRE_IPK_DIR) -type d -exec chmod go+rx {} \; 
  • trunk/make/perl-db-file.mk

    r1212 r1327  
    2020PERL-DB-FILE_SOURCE_DIR=$(SOURCE_DIR)/perl-db-file 
    2121PERL-DB-FILE_IPK_DIR=$(BUILD_DIR)/perl-db-file-$(PERL-DB-FILE_VERSION)-ipk 
    22 PERL-DB-FILE_IPK=$(BUILD_DIR)/perl-db-file_$(PERL-DB-FILE_VERSION)-$(PERL-DB-FILE_IPK_VERSION)_armeb.ipk 
     22PERL-DB-FILE_IPK=$(BUILD_DIR)/perl-db-file_$(PERL-DB-FILE_VERSION)-$(PERL-DB-FILE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2323 
    2424$(DL_DIR)/$(PERL-DB-FILE_SOURCE): 
     
    6161 
    6262$(PERL-DB-FILE_IPK): $(PERL-DB-FILE_BUILD_DIR)/.built 
    63         rm -rf $(PERL-DB-FILE_IPK_DIR) $(BUILD_DIR)/perl-db-file_*_armeb.ipk 
     63        rm -rf $(PERL-DB-FILE_IPK_DIR) $(BUILD_DIR)/perl-db-file_*_$(TARGET_ARCH).ipk 
    6464        $(MAKE) -C $(PERL-DB-FILE_BUILD_DIR) DESTDIR=$(PERL-DB-FILE_IPK_DIR) install 
    6565        find $(PERL-DB-FILE_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-dbi.mk

    r1229 r1327  
    1818PERL-DBI_SOURCE_DIR=$(SOURCE_DIR)/perl-dbi 
    1919PERL-DBI_IPK_DIR=$(BUILD_DIR)/perl-dbi-$(PERL-DBI_VERSION)-ipk 
    20 PERL-DBI_IPK=$(BUILD_DIR)/perl-dbi_$(PERL-DBI_VERSION)-$(PERL-DBI_IPK_VERSION)_armeb.ipk 
     20PERL-DBI_IPK=$(BUILD_DIR)/perl-dbi_$(PERL-DBI_VERSION)-$(PERL-DBI_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-DBI_SOURCE): 
     
    5959 
    6060$(PERL-DBI_IPK): $(PERL-DBI_BUILD_DIR)/.built 
    61         rm -rf $(PERL-DBI_IPK_DIR) $(BUILD_DIR)/perl-dbi_*_armeb.ipk 
     61        rm -rf $(PERL-DBI_IPK_DIR) $(BUILD_DIR)/perl-dbi_*_$(TARGET_ARCH).ipk 
    6262        $(MAKE) -C $(PERL-DBI_BUILD_DIR) DESTDIR=$(PERL-DBI_IPK_DIR) install 
    6363        find $(PERL-DBI_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-digest-hmac.mk

    r1210 r1327  
    1818PERL-DIGEST-HMAC_SOURCE_DIR=$(SOURCE_DIR)/perl-digest-hmac 
    1919PERL-DIGEST-HMAC_IPK_DIR=$(BUILD_DIR)/perl-digest-hmac-$(PERL-DIGEST-HMAC_VERSION)-ipk 
    20 PERL-DIGEST-HMAC_IPK=$(BUILD_DIR)/perl-digest-hmac_$(PERL-DIGEST-HMAC_VERSION)-$(PERL-DIGEST-HMAC_IPK_VERSION)_armeb.ipk 
     20PERL-DIGEST-HMAC_IPK=$(BUILD_DIR)/perl-digest-hmac_$(PERL-DIGEST-HMAC_VERSION)-$(PERL-DIGEST-HMAC_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-DIGEST-HMAC_SOURCE): 
     
    5858 
    5959$(PERL-DIGEST-HMAC_IPK): $(PERL-DIGEST-HMAC_BUILD_DIR)/.built 
    60         rm -rf $(PERL-DIGEST-HMAC_IPK_DIR) $(BUILD_DIR)/perl-digest-hmac_*_armeb.ipk 
     60        rm -rf $(PERL-DIGEST-HMAC_IPK_DIR) $(BUILD_DIR)/perl-digest-hmac_*_$(TARGET_ARCH).ipk 
    6161        $(MAKE) -C $(PERL-DIGEST-HMAC_BUILD_DIR) DESTDIR=$(PERL-DIGEST-HMAC_IPK_DIR) install 
    6262        find $(PERL-DIGEST-HMAC_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-digest-sha1.mk

    r1210 r1327  
    1818PERL-DIGEST-SHA1_SOURCE_DIR=$(SOURCE_DIR)/perl-digest-sha1 
    1919PERL-DIGEST-SHA1_IPK_DIR=$(BUILD_DIR)/perl-digest-sha1-$(PERL-DIGEST-SHA1_VERSION)-ipk 
    20 PERL-DIGEST-SHA1_IPK=$(BUILD_DIR)/perl-digest-sha1_$(PERL-DIGEST-SHA1_VERSION)-$(PERL-DIGEST-SHA1_IPK_VERSION)_armeb.ipk 
     20PERL-DIGEST-SHA1_IPK=$(BUILD_DIR)/perl-digest-sha1_$(PERL-DIGEST-SHA1_VERSION)-$(PERL-DIGEST-SHA1_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-DIGEST-SHA1_SOURCE): 
     
    5757 
    5858$(PERL-DIGEST-SHA1_IPK): $(PERL-DIGEST-SHA1_BUILD_DIR)/.built 
    59         rm -rf $(PERL-DIGEST-SHA1_IPK_DIR) $(BUILD_DIR)/perl-digest-sha1_*_armeb.ipk 
     59        rm -rf $(PERL-DIGEST-SHA1_IPK_DIR) $(BUILD_DIR)/perl-digest-sha1_*_$(TARGET_ARCH).ipk 
    6060        $(MAKE) -C $(PERL-DIGEST-SHA1_BUILD_DIR) DESTDIR=$(PERL-DIGEST-SHA1_IPK_DIR) install 
    6161        find $(PERL-DIGEST-SHA1_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-html-parser.mk

    r1210 r1327  
    1818PERL-HTML-PARSER_SOURCE_DIR=$(SOURCE_DIR)/perl-html-parser 
    1919PERL-HTML-PARSER_IPK_DIR=$(BUILD_DIR)/perl-html-parser-$(PERL-HTML-PARSER_VERSION)-ipk 
    20 PERL-HTML-PARSER_IPK=$(BUILD_DIR)/perl-html-parser_$(PERL-HTML-PARSER_VERSION)-$(PERL-HTML-PARSER_IPK_VERSION)_armeb.ipk 
     20PERL-HTML-PARSER_IPK=$(BUILD_DIR)/perl-html-parser_$(PERL-HTML-PARSER_VERSION)-$(PERL-HTML-PARSER_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-HTML-PARSER_SOURCE): 
     
    5959 
    6060$(PERL-HTML-PARSER_IPK): $(PERL-HTML-PARSER_BUILD_DIR)/.built 
    61         rm -rf $(PERL-HTML-PARSER_IPK_DIR) $(BUILD_DIR)/perl-html-parser_*_armeb.ipk 
     61        rm -rf $(PERL-HTML-PARSER_IPK_DIR) $(BUILD_DIR)/perl-html-parser_*_$(TARGET_ARCH).ipk 
    6262        $(MAKE) -C $(PERL-HTML-PARSER_BUILD_DIR) DESTDIR=$(PERL-HTML-PARSER_IPK_DIR) install 
    6363        find $(PERL-HTML-PARSER_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-html-tagset.mk

    r1210 r1327  
    1818PERL-HTML-TAGSET_SOURCE_DIR=$(SOURCE_DIR)/perl-html-tagset 
    1919PERL-HTML-TAGSET_IPK_DIR=$(BUILD_DIR)/perl-html-tagset-$(PERL-HTML-TAGSET_VERSION)-ipk 
    20 PERL-HTML-TAGSET_IPK=$(BUILD_DIR)/perl-html-tagset_$(PERL-HTML-TAGSET_VERSION)-$(PERL-HTML-TAGSET_IPK_VERSION)_armeb.ipk 
     20PERL-HTML-TAGSET_IPK=$(BUILD_DIR)/perl-html-tagset_$(PERL-HTML-TAGSET_VERSION)-$(PERL-HTML-TAGSET_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-HTML-TAGSET_SOURCE): 
     
    5757 
    5858$(PERL-HTML-TAGSET_IPK): $(PERL-HTML-TAGSET_BUILD_DIR)/.built 
    59         rm -rf $(PERL-HTML-TAGSET_IPK_DIR) $(BUILD_DIR)/perl-html-tagset_*_armeb.ipk 
     59        rm -rf $(PERL-HTML-TAGSET_IPK_DIR) $(BUILD_DIR)/perl-html-tagset_*_$(TARGET_ARCH).ipk 
    6060        $(MAKE) -C $(PERL-HTML-TAGSET_BUILD_DIR) DESTDIR=$(PERL-HTML-TAGSET_IPK_DIR) install 
    6161        find $(PERL-HTML-TAGSET_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-mime-base64.mk

    r1210 r1327  
    1818PERL-MIME-BASE64_SOURCE_DIR=$(SOURCE_DIR)/perl-mime-base64 
    1919PERL-MIME-BASE64_IPK_DIR=$(BUILD_DIR)/perl-mime-base64-$(PERL-MIME-BASE64_VERSION)-ipk 
    20 PERL-MIME-BASE64_IPK=$(BUILD_DIR)/perl-mime-base64_$(PERL-MIME-BASE64_VERSION)-$(PERL-MIME-BASE64_IPK_VERSION)_armeb.ipk 
     20PERL-MIME-BASE64_IPK=$(BUILD_DIR)/perl-mime-base64_$(PERL-MIME-BASE64_VERSION)-$(PERL-MIME-BASE64_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-MIME-BASE64_SOURCE): 
     
    5757 
    5858$(PERL-MIME-BASE64_IPK): $(PERL-MIME-BASE64_BUILD_DIR)/.built 
    59         rm -rf $(PERL-MIME-BASE64_IPK_DIR) $(BUILD_DIR)/perl-mime-base64_*_armeb.ipk 
     59        rm -rf $(PERL-MIME-BASE64_IPK_DIR) $(BUILD_DIR)/perl-mime-base64_*_$(TARGET_ARCH).ipk 
    6060        $(MAKE) -C $(PERL-MIME-BASE64_BUILD_DIR) DESTDIR=$(PERL-MIME-BASE64_IPK_DIR) install 
    6161        find $(PERL-MIME-BASE64_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-net-dns.mk

    r1210 r1327  
    1818PERL-NET-DNS_SOURCE_DIR=$(SOURCE_DIR)/perl-net-dns 
    1919PERL-NET-DNS_IPK_DIR=$(BUILD_DIR)/perl-net-dns-$(PERL-NET-DNS_VERSION)-ipk 
    20 PERL-NET-DNS_IPK=$(BUILD_DIR)/perl-net-dns_$(PERL-NET-DNS_VERSION)-$(PERL-NET-DNS_IPK_VERSION)_armeb.ipk 
     20PERL-NET-DNS_IPK=$(BUILD_DIR)/perl-net-dns_$(PERL-NET-DNS_VERSION)-$(PERL-NET-DNS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-NET-DNS_SOURCE): 
     
    5858 
    5959$(PERL-NET-DNS_IPK): $(PERL-NET-DNS_BUILD_DIR)/.built 
    60         rm -rf $(PERL-NET-DNS_IPK_DIR) $(BUILD_DIR)/perl-net-dns_*_armeb.ipk 
     60        rm -rf $(PERL-NET-DNS_IPK_DIR) $(BUILD_DIR)/perl-net-dns_*_$(TARGET_ARCH).ipk 
    6161        $(MAKE) -C $(PERL-NET-DNS_BUILD_DIR) DESTDIR=$(PERL-NET-DNS_IPK_DIR) install 
    6262        find $(PERL-NET-DNS_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-net-ident.mk

    r1210 r1327  
    1818PERL-NET-IDENT_SOURCE_DIR=$(SOURCE_DIR)/perl-net-ident 
    1919PERL-NET-IDENT_IPK_DIR=$(BUILD_DIR)/perl-net-ident-$(PERL-NET-IDENT_VERSION)-ipk 
    20 PERL-NET-IDENT_IPK=$(BUILD_DIR)/perl-net-ident_$(PERL-NET-IDENT_VERSION)-$(PERL-NET-IDENT_IPK_VERSION)_armeb.ipk 
     20PERL-NET-IDENT_IPK=$(BUILD_DIR)/perl-net-ident_$(PERL-NET-IDENT_VERSION)-$(PERL-NET-IDENT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-NET-IDENT_SOURCE): 
     
    5858 
    5959$(PERL-NET-IDENT_IPK): $(PERL-NET-IDENT_BUILD_DIR)/.built 
    60         rm -rf $(PERL-NET-IDENT_IPK_DIR) $(BUILD_DIR)/perl-net-ident_*_armeb.ipk 
     60        rm -rf $(PERL-NET-IDENT_IPK_DIR) $(BUILD_DIR)/perl-net-ident_*_$(TARGET_ARCH).ipk 
    6161        $(MAKE) -C $(PERL-NET-IDENT_BUILD_DIR) DESTDIR=$(PERL-NET-IDENT_IPK_DIR) install 
    6262        find $(PERL-NET-IDENT_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-spamassassin.mk

    r1264 r1327  
    2121PERL-SPAMASSASSIN_SOURCE_DIR=$(SOURCE_DIR)/perl-spamassassin 
    2222PERL-SPAMASSASSIN_IPK_DIR=$(BUILD_DIR)/perl-spamassassin-$(PERL-SPAMASSASSIN_VERSION)-ipk 
    23 PERL-SPAMASSASSIN_IPK=$(BUILD_DIR)/perl-spamassassin_$(PERL-SPAMASSASSIN_VERSION)-$(PERL-SPAMASSASSIN_IPK_VERSION)_armeb.ipk 
     23PERL-SPAMASSASSIN_IPK=$(BUILD_DIR)/perl-spamassassin_$(PERL-SPAMASSASSIN_VERSION)-$(PERL-SPAMASSASSIN_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2424 
    2525$(DL_DIR)/$(PERL-SPAMASSASSIN_SOURCE): 
     
    6666 
    6767$(PERL-SPAMASSASSIN_IPK): $(PERL-SPAMASSASSIN_BUILD_DIR)/.built 
    68         rm -rf $(PERL-SPAMASSASSIN_IPK_DIR) $(BUILD_DIR)/perl-spamassassin_*_armeb.ipk 
     68        rm -rf $(PERL-SPAMASSASSIN_IPK_DIR) $(BUILD_DIR)/perl-spamassassin_*_$(TARGET_ARCH).ipk 
    6969        $(MAKE) -C $(PERL-SPAMASSASSIN_BUILD_DIR) DESTDIR=$(PERL-SPAMASSASSIN_IPK_DIR) install 
    7070        find $(PERL-SPAMASSASSIN_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-storable.mk

    r1210 r1327  
    1818PERL-STORABLE_SOURCE_DIR=$(SOURCE_DIR)/perl-storable 
    1919PERL-STORABLE_IPK_DIR=$(BUILD_DIR)/perl-storable-$(PERL-STORABLE_VERSION)-ipk 
    20 PERL-STORABLE_IPK=$(BUILD_DIR)/perl-storable_$(PERL-STORABLE_VERSION)-$(PERL-STORABLE_IPK_VERSION)_armeb.ipk 
     20PERL-STORABLE_IPK=$(BUILD_DIR)/perl-storable_$(PERL-STORABLE_VERSION)-$(PERL-STORABLE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-STORABLE_SOURCE): 
     
    5757 
    5858$(PERL-STORABLE_IPK): $(PERL-STORABLE_BUILD_DIR)/.built 
    59         rm -rf $(PERL-STORABLE_IPK_DIR) $(BUILD_DIR)/perl-storable_*_armeb.ipk 
     59        rm -rf $(PERL-STORABLE_IPK_DIR) $(BUILD_DIR)/perl-storable_*_$(TARGET_ARCH).ipk 
    6060        $(MAKE) -C $(PERL-STORABLE_BUILD_DIR) DESTDIR=$(PERL-STORABLE_IPK_DIR) install 
    6161        find $(PERL-STORABLE_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl-time-hires.mk

    r1210 r1327  
    1818PERL-TIME-HIRES_SOURCE_DIR=$(SOURCE_DIR)/perl-time-hires 
    1919PERL-TIME-HIRES_IPK_DIR=$(BUILD_DIR)/perl-time-hires-$(PERL-TIME-HIRES_VERSION)-ipk 
    20 PERL-TIME-HIRES_IPK=$(BUILD_DIR)/perl-time-hires_$(PERL-TIME-HIRES_VERSION)-$(PERL-TIME-HIRES_IPK_VERSION)_armeb.ipk 
     20PERL-TIME-HIRES_IPK=$(BUILD_DIR)/perl-time-hires_$(PERL-TIME-HIRES_VERSION)-$(PERL-TIME-HIRES_IPK_VERSION)_$(TARGET_ARCH).ipk 
    2121 
    2222$(DL_DIR)/$(PERL-TIME-HIRES_SOURCE): 
     
    5757 
    5858$(PERL-TIME-HIRES_IPK): $(PERL-TIME-HIRES_BUILD_DIR)/.built 
    59         rm -rf $(PERL-TIME-HIRES_IPK_DIR) $(BUILD_DIR)/perl-time-hires_*_armeb.ipk 
     59        rm -rf $(PERL-TIME-HIRES_IPK_DIR) $(BUILD_DIR)/perl-time-hires_*_$(TARGET_ARCH).ipk 
    6060        $(MAKE) -C $(PERL-TIME-HIRES_BUILD_DIR) DESTDIR=$(PERL-TIME-HIRES_IPK_DIR) install 
    6161        find $(PERL-TIME-HIRES_IPK_DIR)/opt -name 'perllocal.pod' -exec rm -f {} \; 
  • trunk/make/perl.mk

    r875 r1327  
    5555PERL_SOURCE_DIR=$(SOURCE_DIR)/perl 
    5656PERL_IPK_DIR=$(BUILD_DIR)/perl-$(PERL_VERSION)-ipk 
    57 PERL_IPK=$(BUILD_DIR)/perl_$(PERL_VERSION)-$(PERL_IPK_VERSION)_armeb.ipk 
     57PERL_IPK=$(BUILD_DIR)/perl_$(PERL_VERSION)-$(PERL_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5858 
    5959# 
     
    9494        cp $(PERL_BUILD_DIR)/ext/Errno/Errno_pm.PL $(PERL_BUILD_DIR)/ext/Errno/Errno_pm.PL.bak 
    9595        cat $(PERL_BUILD_DIR)/ext/Errno/Errno_pm.PL | \ 
    96         sed -e 's:/usr/include/errno.h:/opt/armeb/$(GNU_TARGET_NAME)/include/errno.h:g'\ 
     96        sed -e 's:/usr/include/errno.h:/opt/$(TARGET_ARCH)/$(GNU_TARGET_NAME)/include/errno.h:g'\ 
    9797        > $(PERL_BUILD_DIR)/ext/Errno/tmp 
    9898        mv -f $(PERL_BUILD_DIR)/ext/Errno/tmp $(PERL_BUILD_DIR)/ext/Errno/Errno_pm.PL 
     
    138138# 
    139139$(PERL_IPK): $(PERL_BUILD_DIR)/.built 
    140         rm -rf $(PERL_IPK_DIR) $(BUILD_DIR)/perl_*_armeb.ipk 
     140        rm -rf $(PERL_IPK_DIR) $(BUILD_DIR)/perl_*_$(TARGET_ARCH).ipk 
    141141        $(MAKE) -C $(PERL_BUILD_DIR) DESTDIR=$(PERL_IPK_DIR) install.perl 
    142142        rm -f $(PERL_IPK_DIR)/opt/bin/perl 
  • trunk/make/php.mk

    r1321 r1327  
    8383PHP_SOURCE_DIR=$(SOURCE_DIR)/php 
    8484PHP_IPK_DIR=$(BUILD_DIR)/php-$(PHP_VERSION)-ipk 
    85 PHP_IPK=$(BUILD_DIR)/php_$(PHP_VERSION)-$(PHP_IPK_VERSION)_armeb.ipk 
     85PHP_IPK=$(BUILD_DIR)/php_$(PHP_VERSION)-$(PHP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    8686 
    8787# 
     
    9292        @rm -f $@ 
    9393        @echo "Package: php" >>$@ 
    94         @echo "Architecture: armeb" >>$@ 
     94        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    9595        @echo "Priority: $(PHP_PRIORITY)" >>$@ 
    9696        @echo "Section: $(PHP_SECTION)" >>$@ 
     
    221221# 
    222222$(PHP_IPK): $(PHP_BUILD_DIR)/.built 
    223         rm -rf $(PHP_IPK_DIR) $(BUILD_DIR)/php_*_armeb.ipk 
     223        rm -rf $(PHP_IPK_DIR) $(BUILD_DIR)/php_*_$(TARGET_ARCH).ipk 
    224224        install -d $(PHP_IPK_DIR)/opt/etc/apache2/conf.d 
    225225        install -d $(PHP_IPK_DIR)/opt/var/lib/php/session 
  • trunk/make/pkgconfig.mk

    r1097 r1327  
    6363PKGCONFIG_SOURCE_DIR=$(SOURCE_DIR)/pkgconfig 
    6464PKGCONFIG_IPK_DIR=$(BUILD_DIR)/pkgconfig-$(PKGCONFIG_VERSION)-ipk 
    65 PKGCONFIG_IPK=$(BUILD_DIR)/pkgconfig_$(PKGCONFIG_VERSION)-$(PKGCONFIG_IPK_VERSION)_armeb.ipk 
     65PKGCONFIG_IPK=$(BUILD_DIR)/pkgconfig_$(PKGCONFIG_VERSION)-$(PKGCONFIG_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6666 
    6767# 
     
    7272        @rm -f $@ 
    7373        @echo "Package: pkgconfig" >>$@ 
    74         @echo "Architecture: armeb" >>$@ 
     74        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    7575        @echo "Priority: $(PKGCONFIG_PRIORITY)" >>$@ 
    7676        @echo "Section: $(PKGCONFIG_SECTION)" >>$@ 
     
    158158# 
    159159$(PKGCONFIG_IPK): $(PKGCONFIG_BUILD_DIR)/.built 
    160         rm -rf $(PKGCONFIG_IPK_DIR) $(BUILD_DIR)/pkgconfig_*_armeb.ipk 
     160        rm -rf $(PKGCONFIG_IPK_DIR) $(BUILD_DIR)/pkgconfig_*_$(TARGET_ARCH).ipk 
    161161        $(MAKE) -C $(PKGCONFIG_BUILD_DIR) DESTDIR=$(PKGCONFIG_IPK_DIR) install-strip 
    162162        $(MAKE) $(PKGCONFIG_IPK_DIR)/CONTROL/control 
  • trunk/make/popt.mk

    r589 r1327  
    5656POPT_SOURCE_DIR=$(SOURCE_DIR)/popt 
    5757POPT_IPK_DIR=$(BUILD_DIR)/popt-$(POPT_VERSION)-ipk 
    58 POPT_IPK=$(BUILD_DIR)/popt_$(POPT_VERSION)-$(POPT_IPK_VERSION)_armeb.ipk 
     58POPT_IPK=$(BUILD_DIR)/popt_$(POPT_VERSION)-$(POPT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    144144# 
    145145$(POPT_IPK): $(POPT_BUILD_DIR)/.built 
    146         rm -rf $(POPT_IPK_DIR) $(BUILD_DIR)/popt_*_armeb.ipk 
     146        rm -rf $(POPT_IPK_DIR) $(BUILD_DIR)/popt_*_$(TARGET_ARCH).ipk 
    147147        $(MAKE) -C $(POPT_BUILD_DIR) DESTDIR=$(POPT_IPK_DIR) install-includeHEADERS install-exec-am 
    148148        install -d $(POPT_IPK_DIR)/CONTROL 
    149         install -m 644 $(POPT_SOURCE_DIR)/control $(POPT_IPK_DIR)/CONTROL/control 
     149        sed -e "s/@ARCH@/$(TARGET_ARCH)/" -e "s/@VERSION@/$(POPT_VERSION)/" \ 
     150                -e "s/@RELEASE@/$(POPT_IPK_VERSION)/" $(POPT_SOURCE_DIR)/control > $(POPT_IPK_DIR)/CONTROL/control 
    150151        cd $(BUILD_DIR); $(IPKG_BUILD) $(POPT_IPK_DIR) 
    151152 
  • trunk/make/portmap.mk

    r661 r1327  
    5656PORTMAP_SOURCE_DIR=$(SOURCE_DIR)/portmap 
    5757PORTMAP_IPK_DIR=$(BUILD_DIR)/portmap-$(PORTMAP_VERSION)-ipk 
    58 PORTMAP_IPK=$(BUILD_DIR)/portmap_$(PORTMAP_VERSION)-$(PORTMAP_IPK_VERSION)_armeb.ipk 
     58PORTMAP_IPK=$(BUILD_DIR)/portmap_$(PORTMAP_VERSION)-$(PORTMAP_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    152152# 
    153153$(PORTMAP_IPK): $(PORTMAP_BUILD_DIR)/.built 
    154         rm -rf $(PORTMAP_IPK_DIR) $(BUILD_DIR)/portmap_*_armeb.ipk 
     154        rm -rf $(PORTMAP_IPK_DIR) $(BUILD_DIR)/portmap_*_$(TARGET_ARCH).ipk 
    155155        install -d $(PORTMAP_IPK_DIR)/opt/sbin 
    156156        $(STRIP_COMMAND) $(PORTMAP_BUILD_DIR)/portmap -o $(PORTMAP_IPK_DIR)/opt/sbin/portmap 
  • trunk/make/postfix.mk

    r1221 r1327  
    2727POSTFIX_SOURCE_DIR=$(SOURCE_DIR)/postfix 
    2828POSTFIX_IPK_DIR=$(BUILD_DIR)/postfix-$(POSTFIX_VERSION)-ipk 
    29 POSTFIX_IPK=$(BUILD_DIR)/postfix_$(POSTFIX_VERSION)-$(POSTFIX_IPK_VERSION)_armeb.ipk 
     29POSTFIX_IPK=$(BUILD_DIR)/postfix_$(POSTFIX_VERSION)-$(POSTFIX_IPK_VERSION)_$(TARGET_ARCH).ipk 
    3030 
    3131$(DL_DIR)/$(POSTFIX_SOURCE): 
     
    9797 
    9898$(POSTFIX_IPK): $(POSTFIX_BUILD_DIR)/.built 
    99         rm -rf $(POSTFIX_IPK_DIR) $(BUILD_DIR)/postfix_*_armeb.ipk 
     99        rm -rf $(POSTFIX_IPK_DIR) $(BUILD_DIR)/postfix_*_$(TARGET_ARCH).ipk 
    100100        $(MAKE) -C $(POSTFIX_BUILD_DIR) install_root=$(POSTFIX_IPK_DIR) mail_owner=mail setgid_group=maildrop upgrade LD_LIBRARY_PATH=$(STAGING_LIB_DIR) 
    101101        /bin/sed -i 's/\(\bPATH=\)/\1\/opt\/bin:\/opt\/sbin:/g' $(POSTFIX_IPK_DIR)/opt/etc/postfix/post-install 
  • trunk/make/procps.mk

    r1237 r1327  
    1414PROCPS_IPK_VERSION=3 
    1515 
    16 PROCPS_IPK=$(BUILD_DIR)/procps_$(PROCPS_VERSION)-$(PROCPS_IPK_VERSION)_armeb.ipk 
     16PROCPS_IPK=$(BUILD_DIR)/procps_$(PROCPS_VERSION)-$(PROCPS_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1717PROCPS_IPK_DIR=$(BUILD_DIR)/procps-$(PROCPS_VERSION)-ipk 
    1818 
     
    7373# 
    7474$(PROCPS_IPK): $(PROCPS_DIR)/watch 
    75         rm -rf $(PROCPS_IPK_DIR) $(BUILD_DIR)/procps_*_armeb.ipk 
     75        rm -rf $(PROCPS_IPK_DIR) $(BUILD_DIR)/procps_*_$(TARGET_ARCH).ipk 
    7676        mkdir -p $(PROCPS_IPK_DIR)/CONTROL 
    7777        mkdir -p $(PROCPS_IPK_DIR)/opt 
  • trunk/make/proftpd.mk

    r1177 r1327  
    6060PROFTPD_SOURCE_DIR=$(SOURCE_DIR)/proftpd 
    6161PROFTPD_IPK_DIR=$(BUILD_DIR)/proftpd-$(PROFTPD_VERSION)-ipk 
    62 PROFTPD_IPK=$(BUILD_DIR)/proftpd_$(PROFTPD_VERSION)-$(PROFTPD_IPK_VERSION)_armeb.ipk 
     62PROFTPD_IPK=$(BUILD_DIR)/proftpd_$(PROFTPD_VERSION)-$(PROFTPD_IPK_VERSION)_$(TARGET_ARCH).ipk 
    6363 
    6464# 
     
    154154$(PROFTPD_IPK): $(PROFTPD_BUILD_DIR)/.built 
    155155        # Clean it all 
    156         rm -rf $(PROFTPD_IPK_DIR) $(BUILD_DIR)/proftpd_*_armeb.ipk 
     156        rm -rf $(PROFTPD_IPK_DIR) $(BUILD_DIR)/proftpd_*_$(TARGET_ARCH).ipk 
    157157        # Install sbin files 
    158158        install -d $(PROFTPD_IPK_DIR)/opt/sbin 
  • trunk/make/puppy.mk

    r1288 r1327  
    3131PUPPY_SOURCE_DIR=$(SOURCE_DIR)/puppy 
    3232PUPPY_IPK_DIR=$(BUILD_DIR)/puppy-$(PUPPY_VERSION)-ipk 
    33 PUPPY_IPK=$(BUILD_DIR)/puppy_$(PUPPY_VERSION)-$(PUPPY_IPK_VERSION)_armeb.ipk 
     33PUPPY_IPK=$(BUILD_DIR)/puppy_$(PUPPY_VERSION)-$(PUPPY_IPK_VERSION)_$(TARGET_ARCH).ipk 
    3434 
    3535# 
     
    9999# 
    100100$(PUPPY_IPK): $(PUPPY_BUILD_DIR)/puppy 
    101         rm -rf $(PUPPY_IPK_DIR) $(BUILD_DIR)/puppy_*_armeb.ipk 
     101        rm -rf $(PUPPY_IPK_DIR) $(BUILD_DIR)/puppy_*_$(TARGET_ARCH).ipk 
    102102        install -d $(PUPPY_IPK_DIR)/opt/bin 
    103103        $(STRIP_COMMAND) $(PUPPY_BUILD_DIR)/puppy -o $(PUPPY_IPK_DIR)/opt/bin/puppy 
  • trunk/make/python.mk

    r862 r1327  
    5656PYTHON_SOURCE_DIR=$(SOURCE_DIR)/python 
    5757PYTHON_IPK_DIR=$(BUILD_DIR)/python-$(PYTHON_VERSION)-ipk 
    58 PYTHON_IPK=$(BUILD_DIR)/python_$(PYTHON_VERSION)-$(PYTHON_IPK_VERSION)_armeb.ipk 
     58PYTHON_IPK=$(BUILD_DIR)/python_$(PYTHON_VERSION)-$(PYTHON_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
  • trunk/make/rdate.mk

    r1237 r1327  
    1616RDATE_IPK_VERSION=1 
    1717 
    18 RDATE_IPK=$(BUILD_DIR)/rdate_$(RDATE_VERSION)-$(RDATE_IPK_VERSION)_armeb.ipk 
     18RDATE_IPK=$(BUILD_DIR)/rdate_$(RDATE_VERSION)-$(RDATE_IPK_VERSION)_$(TARGET_ARCH).ipk 
    1919RDATE_IPK_DIR=$(BUILD_DIR)/rdate-$(RDATE_VERSION)-ipk 
    2020 
  • trunk/make/recordext.mk

    r1138 r1327  
    5656RECORDEXT_SOURCE_DIR=$(SOURCE_DIR)/recordext 
    5757RECORDEXT_IPK_DIR=$(BUILD_DIR)/recordext-$(RECORDEXT_VERSION)-ipk 
    58 RECORDEXT_IPK=$(BUILD_DIR)/recordext_$(RECORDEXT_VERSION)-$(RECORDEXT_IPK_VERSION)_armeb.ipk 
     58RECORDEXT_IPK=$(BUILD_DIR)/recordext_$(RECORDEXT_VERSION)-$(RECORDEXT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    6565        @rm -f $@ 
    6666        @echo "Package: recordext" >>$@ 
    67         @echo "Architecture: armeb" >>$@ 
     67        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    6868        @echo "Priority: $(RECORDEXT_PRIORITY)" >>$@ 
    6969        @echo "Section: $(RECORDEXT_SECTION)" >>$@ 
     
    152152# 
    153153$(RECORDEXT_IPK): $(RECORDEXT_BUILD_DIR)/.built 
    154         rm -rf $(RECORDEXT_IPK_DIR) $(BUILD_DIR)/recordext_*_armeb.ipk 
     154        rm -rf $(RECORDEXT_IPK_DIR) $(BUILD_DIR)/recordext_*_$(TARGET_ARCH).ipk 
    155155        $(MAKE) -C $(RECORDEXT_BUILD_DIR) DESTDIR=$(RECORDEXT_IPK_DIR) install 
    156156        $(MAKE) $(RECORDEXT_IPK_DIR)/CONTROL/control 
  • trunk/make/renderext.mk

    r1138 r1327  
    5656RENDEREXT_SOURCE_DIR=$(SOURCE_DIR)/renderext 
    5757RENDEREXT_IPK_DIR=$(BUILD_DIR)/renderext-$(RENDEREXT_VERSION)-ipk 
    58 RENDEREXT_IPK=$(BUILD_DIR)/renderext_$(RENDEREXT_VERSION)-$(RENDEREXT_IPK_VERSION)_armeb.ipk 
     58RENDEREXT_IPK=$(BUILD_DIR)/renderext_$(RENDEREXT_VERSION)-$(RENDEREXT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    5959 
    6060# 
     
    6565        @rm -f $@ 
    6666        @echo "Package: renderext" >>$@ 
    67         @echo "Architecture: armeb" >>$@ 
     67        @echo "Architecture: $(TARGET_ARCH)" >>$@ 
    6868        @echo "Priority: $(RENDEREXT_PRIORITY)" >>$@ 
    6969        @echo "Section: $(RENDEREXT_SECTION)" >>$@ 
     
    152152# 
    153153$(RENDEREXT_IPK): $(RENDEREXT_BUILD_DIR)/.built 
    154         rm -rf $(RENDEREXT_IPK_DIR) $(BUILD_DIR)/renderext_*_armeb.ipk 
     154        rm -rf $(RENDEREXT_IPK_DIR) $(BUILD_DIR)/renderext_*_$(TARGET_ARCH).ipk 
    155155        $(MAKE) -C $(RENDEREXT_BUILD_DIR) DESTDIR=$(RENDEREXT_IPK_DIR) install 
    156156        $(MAKE) $(RENDEREXT_IPK_DIR)/CONTROL/control 
  • trunk/make/rsnapshot.mk

    r1310 r1327  
    2929RSNAPSHOT_SOURCE_DIR=$(SOURCE_DIR)/rsnapshot 
    3030RSNAPSHOT_IPK_DIR=$(BUILD_DIR)/rsnapshot-$(RSNAPSHOT_VERSION)-ipk 
    31 RSNAPSHOT_IPK=$(BUILD_DIR)/rsnapshot_$(RSNAPSHOT_VERSION)-$(RSNAPSHOT_IPK_VERSION)_armeb.ipk 
     31RSNAPSHOT_IPK=$(BUILD_DIR)/rsnapshot_$(RSNAPSHOT_VERSION)-$(RSNAPSHOT_IPK_VERSION)_$(TARGET_ARCH).ipk 
    3232 
    3333$(RSNAPSHOT_IPK_DIR)/CONTROL/control: 
     
    3535        @rm -f $@&