diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-21 19:45:43 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-21 19:45:43 +0000 |
| commit | a70bc32cd0ab4f8af0c4aae351702fcbbe377f3e (patch) | |
| tree | 7b146b7f01401874cace02cd61ec7019e2a49de4 | |
| parent | 27e148b95992167a93a8c828c012e6bb42ca4ef3 (diff) | |
| download | midipix_build-a70bc32cd0ab4f8af0c4aae351702fcbbe377f3e.tar.bz2 midipix_build-a70bc32cd0ab4f8af0c4aae351702fcbbe377f3e.tar.xz | |
vars/libfirm.vars: correctly install to & reference ${PKG_DESTDIR}.
subr/pkg_install_subdirs.subr: fix ${PKG_DESTDIR} reference.
| -rw-r--r-- | subr/pkg_install_subdirs.subr | 17 | ||||
| -rw-r--r-- | vars/libfirm.vars | 15 |
2 files changed, 12 insertions, 20 deletions
diff --git a/subr/pkg_install_subdirs.subr b/subr/pkg_install_subdirs.subr index c63eda70..9ab301b6 100644 --- a/subr/pkg_install_subdirs.subr +++ b/subr/pkg_install_subdirs.subr @@ -3,15 +3,14 @@ # pkg_install_subdirs() { - pkg_install_files "${PWD}/.." \ - /=destdir \ - /=destdir/bin \ - /=destdir/lib \ - /=destdir/sbin \ - /=destdir/share/man/man1 \ - /=destdir/share/man \ - @.=destdir/usr \ - @share/man=destdir/man; + pkg_install_files "${PKG_DESTDIR}" \ + /=bin \ + /=lib \ + /=sbin \ + /=share/man/man1 \ + /=share/man \ + @.=usr \ + @share/man=man; }; # vim:filetype=sh diff --git a/vars/libfirm.vars b/vars/libfirm.vars index b9898971..87a75c64 100644 --- a/vars/libfirm.vars +++ b/vars/libfirm.vars @@ -2,24 +2,17 @@ # set -o errexit -o noglob are assumed. # -pkg_libfirm_configure_pre() { - build_fileop mkdir cparser+libfirm/sysroot cparser+libfirm/build/libfirm; -}; - pkg_cparser_configure_pre() { - build_fileop mkdir cparser+libfirm/sysroot cparser+libfirm/build/cparser; - export CFLAGS_PATH="-I../../sysroot/include"; - export LDFLAGS_PATH="-L../../sysroot/lib"; + export CFLAGS_PATH="-I${PKG_DESTDIR}/include"; + export LDFLAGS_PATH="-L${PKG_DESTDIR}/lib"; }; pkg_libfirm_install_make() { - make ${PKG_MAKEFLAGS_BUILD} DESTDIR=../../sysroot install; - make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PREFIX_NATIVE}" install; + make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install; }; pkg_cparser_install_make() { - make ${PKG_MAKEFLAGS_BUILD} DESTDIR=../../sysroot install; - make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PREFIX_NATIVE}" install; + make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install; }; # vim:filetype=sh |