diff options
| -rw-r--r-- | subr/ex_setup_subdirs.subr | 8 | ||||
| -rw-r--r-- | vars/env.vars | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/subr/ex_setup_subdirs.subr b/subr/ex_setup_subdirs.subr index 5d74e15c..e6f0fbf9 100644 --- a/subr/ex_setup_subdirs.subr +++ b/subr/ex_setup_subdirs.subr @@ -3,13 +3,11 @@ # ex_setup_subdirs() { - local __; + local _pname; if [ ${ARG_CLEAN:-0} -eq 1 ]; then ex_log_msg info "-c specified, cleaning prefix..."; - for __ in ${CLEAR_PREFIX_DIRS}; do - if [ -e ${PREFIX}/${__} ]; then - build_rm ${PREFIX}/${__}; - fi; + for _pname in ${CLEAR_PREFIX_PATHS}; do + ex_build_fileop rm ${PREFIX}/${_pname}; done; fi; pkg_install_files "" \ diff --git a/vars/env.vars b/vars/env.vars index 044c0d25..454f93b6 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -33,7 +33,7 @@ MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_LOG_VARS SHA256SUM SLIBTOOL SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION"}; : ${CLEAR_ENV_VARS_EXCEPT:="ARG_VERBOSE ARG_VERBOSE2 ARG_VERBOSE3 DEFAULT_GITROOT_HEAD HOME PATH SHELL TERM TARBALL_SIGN_GPG_KEY USER"}; -: ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix doc include info lib lib64 libexec man minipix native sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32"}; +: ${CLEAR_PREFIX_PATHS:="bin i686-nt32-midipix doc include info lib lib64 libexec man minipix native sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 midipix.sh midipix_shortcut.vbs README"}; # Default flags : ${DEFAULT_BUILD_CPUS:=1}; |