* Fix generation of libr.pc from ACR instead of the hacky makefile way

This commit is contained in:
pancake/fluendo 2009-04-20 17:54:18 +02:00
parent ee7e8c10ee
commit 2495a30317
3 changed files with 2 additions and 4 deletions

3
configure vendored
View file

@ -260,7 +260,6 @@ echo "checking target system type... ${TARGET}"
[ "${CROSSBUILD}" = 1 ] && echo "using crosscompilation mode."
split_host BUILD HOST TARGET
[ -n "${prefix}" ] && PREFIX=${prefix}
echo "checking for working directories... ${WODIS}"
echo "using prefix '${PREFIX}'"
ACR_RMFILES=" test.c a.out a.exe"
@ -343,7 +342,7 @@ for A in ${ENVWORDS} ; do
SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
done
SEDFLAGS="${SEDFLAGS}'"
for A in ./config-user.mk libr/include/r_userconf.h ; do # SUBDIRS
for A in ./config-user.mk libr/libr.pc libr/include/r_userconf.h ; do # SUBDIRS
if [ -f "${VPATH}/${A}.acr" ]; then
SD_TARGET=${A}
else

View file

@ -33,4 +33,4 @@ IF WANT_VALA {
REPORT PREFIX HAVE_LIB_EWF HAVE_LIB_TCC HAVE_VALAC DEBUGGER USERCC USEROSTYPE ;
SUBDIRS ./config-user.mk libr/include/r_userconf.h ;
SUBDIRS ./config-user.mk libr/libr.pc libr/include/r_userconf.h ;

View file

@ -41,7 +41,6 @@ install:
do echo " $$a"; ${INSTALL_PROGRAM} $$a ${PFX}/bin ; done
# plugins
@${INSTALL_DIR} ${PFX}/lib/pkgconfig
cat libr.pc.acr | sed -e 's,@PFX@,${PFX},g' > libr.pc
${INSTALL_DATA} libr.pc ${PFX}/lib/pkgconfig
@${INSTALL_DIR} ${PFX}/share/vala/vapi
${INSTALL_DATA} vapi/*.vapi vapi/*.deps ${PFX}/share/vala/vapi