Changeset 2069

Show
Ignore:
Timestamp:
02/18/07 18:32:01 (2 years ago)
Author:
tg
Message:

• minor style: use ${...} for vars
• restrict to 80 column width (| ed -> | \ <newline><tab><4 spaces>ed)
• ed can, in contrast to ${SED}, do multiple replacements at once

just minor optimisations, no critique ;)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/apr/Makefile

    r2067 r2069  
    1111PKG_RELEASE:=           1 
    1212PKG_MD5SUM:=            233894af598d8347fd68cf836e7dee91 
    13 PKG_SOURCE_URL:=        http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/$(PKG_NAME) 
     13PKG_SOURCE_URL:=        http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME} 
    1414 
    1515include ${TOPDIR}/mk/package.mk 
    1616 
    17 $(eval $(call PKG_template,APR,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
     17$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    1818 
    1919CONFIGURE_STYLE:=       gnu 
    …… 
    2424CONFIGURE_ARGS+=        --enable-nonportable-atomics 
    2525 
    26 ifeq ($(FWRT_PACKAGE_APR_THREADING),y) 
     26ifeq (${FWRT_PACKAGE_APR_THREADING},y) 
    2727CONFIGURE_ARGS+=        --enable-threads 
    2828else 
    …… 
    4141 
    4242        # we need to patch paths to get apr-util compiling 
    43         printf '/^installbuilddir="/s##&${STAGING_DIR}/#\nwq\n' | ed -s ${WRKINST}/usr/bin/apr-config 
    44         printf '/^libdir="/s##&${STAGING_DIR}/#\nwq\n' | ed -s ${WRKINST}/usr/bin/apr-config 
    45         printf '/^datadir="/s##&${STAGING_DIR}/#\nwq\n' | ed -s ${WRKINST}/usr/bin/apr-config 
    46         printf '/^includedir="/s##&${STAGING_DIR}/#\nwq\n' | ed -s ${WRKINST}/usr/bin/apr-config 
    47         printf '/^bindir="/s##&${STAGING_DIR}/#\nwq\n' | ed -s ${WRKINST}/usr/bin/apr-config 
     43        printf '%s\n%s\n%s\n%s\n%s\nwq\n' \ 
     44            '/^installbuilddir="/s##&${STAGING_DIR}/#' 
     45            '/^libdir="/s##&${STAGING_DIR}/#' 
     46            '/^datadir="/s##&${STAGING_DIR}/#' 
     47            '/^includedir="/s##&${STAGING_DIR}/#' 
     48            '/^bindir="/s##&${STAGING_DIR}/#' | \ 
     49            ed -s ${WRKINST}/usr/bin/apr-config 
    4850 
    4951include ${TOPDIR}/mk/pkg-bottom.mk