diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-26 22:26:13 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-26 22:26:13 +0000 |
| commit | aa37e639c68ce3724c5c71773b6399cf02ba8379 (patch) | |
| tree | ac1d2162bcd26976efd0b9bdd4b5628086ab71e5 /subr | |
| parent | 1c6c043f9bf40ce026c03d8bdc1fe8f42c52d9c5 (diff) | |
| download | midipix_build-aa37e639c68ce3724c5c71773b6399cf02ba8379.tar.bz2 midipix_build-aa37e639c68ce3724c5c71773b6399cf02ba8379.tar.xz | |
subr/pkg_{fetch_extract,install_make}.subr, vars/env.vars: minor cleanup.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_fetch_extract.subr | 3 | ||||
| -rw-r--r-- | subr/pkg_install_make.subr | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/subr/pkg_fetch_extract.subr b/subr/pkg_fetch_extract.subr index 9df9f93e..8802a950 100644 --- a/subr/pkg_fetch_extract.subr +++ b/subr/pkg_fetch_extract.subr @@ -12,8 +12,7 @@ pkgp_fetch_extract_type() { }; pkg_fetch_extract() { - if [ -n "${PKG_URL}" ]\ - && [ "${PKG_URL_TYPE:-wget}" = wget ]; then + if [ -n "${PKG_URL}" ]; then _oldpwd="${PWD}"; rtl_fileop cd "${PKG_BASE_DIR}" || return "${?}"; rtl_fileop rm "${PKG_BASE_DIR}/${PKG_SUBDIR}" || return "${?}"; case "$(pkgp_fetch_extract_type "${PKG_NAME}")" in diff --git a/subr/pkg_install_make.subr b/subr/pkg_install_make.subr index 45f5d58f..4babac8f 100644 --- a/subr/pkg_install_make.subr +++ b/subr/pkg_install_make.subr @@ -7,10 +7,6 @@ pkg_install_make() { ${PKG_MAKEFLAGS_INSTALL} \ ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ AR=${PKG_AR} CC=${PKG_CC} RANLIB=${PKG_RANLIB} \ - "${PKG_CFLAGS_INSTALL:+CFLAGS=${PKG_CFLAGS_INSTALL}}" \ - "${PKG_CFLAGS_INSTALL_EXTRA:+CFLAGS+=${PKG_CFLAGS_INSTALL_EXTRA}}" \ - "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ - "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ |