a70bc3 vars/libfirm.vars: correctly install to & reference ${PKG_DESTDIR}.

Authored and Committed by Lucio Andrés Illanes Albornoz (arab, vxp) 7 years ago
    vars/libfirm.vars: correctly install to & reference ${PKG_DESTDIR}.
    subr/pkg_install_subdirs.subr: fix ${PKG_DESTDIR} reference.
    
        
subr/pkg_install_subdirs.subr CHANGED
@@ -3,15 +3,14 @@
3
3
#
4
4
5
5
pkg_install_subdirs() {
6
- pkg_install_files "${PWD}/.." \
7
- /=destdir \
8
- /=destdir/bin \
9
- /=destdir/lib \
10
- /=destdir/sbin \
11
- /=destdir/share/man/man1 \
12
- /=destdir/share/man \
13
- @.=destdir/usr \
6
+ pkg_install_files "${PKG_DESTDIR}" \
7
+ /=bin \
8
+ /=lib \
9
+ /=sbin \
10
+ /=share/man/man1 \
11
+ /=share/man \
12
+ @.=usr \
13
+ @share/man=man;
14
- @share/man=destdir/man;
15
14
};
16
15
17
16
# vim:filetype=sh
file modified
+4 -11
vars/libfirm.vars CHANGED
@@ -2,24 +2,17 @@
2
2
# set -o errexit -o noglob are assumed.
3
3
#
4
4
5
- pkg_libfirm_configure_pre() {
6
- build_fileop mkdir cparser+libfirm/sysroot cparser+libfirm/build/libfirm;
7
- };
8
-
9
5
pkg_cparser_configure_pre() {
10
- build_fileop mkdir cparser+libfirm/sysroot cparser+libfirm/build/cparser;
11
- export CFLAGS_PATH="-I../../sysroot/include";
6
+ export CFLAGS_PATH="-I${PKG_DESTDIR}/include";
7
+ export LDFLAGS_PATH="-L${PKG_DESTDIR}/lib";
12
- export LDFLAGS_PATH="-L../../sysroot/lib";
13
8
};
14
9
15
10
pkg_libfirm_install_make() {
16
- make ${PKG_MAKEFLAGS_BUILD} DESTDIR=../../sysroot install;
11
+ make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install;
17
- make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PREFIX_NATIVE}" install;
18
12
};
19
13
20
14
pkg_cparser_install_make() {
21
- make ${PKG_MAKEFLAGS_BUILD} DESTDIR=../../sysroot install;
15
+ make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install;
22
- make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PREFIX_NATIVE}" install;
23
16
};
24
17
25
18
# vim:filetype=sh