Bugfixing in library module instantitation.
This commit is contained in:
parent
0fdad0a35a
commit
7a3fbaec1f
10 changed files with 58 additions and 63 deletions
|
|
@ -1,4 +1,4 @@
|
|||
build_target lib
|
||||
build_target @NAME@
|
||||
|
||||
# make paths (this is for Gentoo in particular)
|
||||
build_dir_tree "${LIBDIR}" || return 1
|
||||
|
|
@ -7,8 +7,8 @@ build_dir_tree "${INCLUDEDIR}" || return 1
|
|||
|
||||
# install library
|
||||
echo "Installing libraries into '${LIBDIR}'"
|
||||
install_file ${LIBC} ${LIBDIR} 0755 || return 1
|
||||
BASE="${LIBC_BASE}.so"
|
||||
install_file ${@PNAME@} ${LIBDIR} 0755 || return 1
|
||||
BASE="${@PNAME@_BASE}.so"
|
||||
MAJOR="${BASE}.${SOMAJOR}"
|
||||
MINOR="${MAJOR}.${SOMINOR}"
|
||||
MICRO="${MINOR}.${SOMICRO}"
|
||||
|
|
@ -17,18 +17,18 @@ install_symlink "${MAJOR}" "${MINOR}" "${LIBDIR}"
|
|||
install_symlink "${BASE}" "${MAJOR}" "${LIBDIR}"
|
||||
|
||||
# install header
|
||||
echo "Installing header file '${LIBC_HEADER}' into ${INCLUDEDIR}"
|
||||
install_header ${LIBC_HEADER} ${INCLUDEDIR} 0644 || return 1
|
||||
echo "Installing header file '${@PNAME@_HEADER}' into ${INCLUDEDIR}"
|
||||
install_header ${@PNAME@_HEADER} ${INCLUDEDIR} 0644 || return 1
|
||||
|
||||
# install pkgconfig file
|
||||
echo "Installing package config file into ${PKGCONFDIR}"
|
||||
PKGCONFFILE=${PKGCONFDIR}/@P@.pc
|
||||
PKGCONFFILE=${PKGCONFDIR}/@PNAME@.pc
|
||||
do_cmd rm -f ${PKGCONFFILE}
|
||||
do_cmd_redir ${PKGCONFFILE} sed \
|
||||
-e "s,@VERSION@,${VERSION}," \
|
||||
-e "s,@LIBDIR@,${FINALLIBDIR}," \
|
||||
-e "s,@INCLUDEDIR@,${FINALINCLUDEDIR}," \
|
||||
src/clib/pkgconf.in
|
||||
src/@NAME@/pkgconf.in
|
||||
do_cmd chmod 0644 ${PKGCONFFILE}
|
||||
print_success "Done"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue