From 3819051bf37fef04702c6dded63cea61f86bad4c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 6 Feb 2003 17:04:33 +0000 Subject: Remove -L${libdir}. (CFlags): s/includedir/privincludedir/ * evolution-addressbook.pc.in (Libs): Remove -L${libdir}. (CFlags): s/includedir/privincludedir/ * evolution-calendar.pc.in: Likewise * evolution-shell.pc.in: Likewise. Also change iconsdir to imagesdir svn path=/trunk/; revision=19811 --- ChangeLog | 8 ++++++++ evolution-addressbook.pc.in | 5 +++-- evolution-calendar.pc.in | 5 +++-- evolution-shell.pc.in | 7 ++++--- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59e050285c..102ecd0646 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-02-06 Dan Winship + * evolution-addressbook.pc.in (Libs): Remove -L${libdir}. + (CFlags): s/includedir/privincludedir/ + + * evolution-calendar.pc.in: Likewise + + * evolution-shell.pc.in: Likewise. Also change iconsdir to + imagesdir + * sounds/Makefile.am: remove soundsdir def * tools/Makefile.am: subst in $(toolsdir) instead of $(bindir) diff --git a/evolution-addressbook.pc.in b/evolution-addressbook.pc.in index dfdf85412b..ed8f9f09fd 100644 --- a/evolution-addressbook.pc.in +++ b/evolution-addressbook.pc.in @@ -7,10 +7,11 @@ idldir=@idldir@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ privlibdir=@privlibdir@ +privincludedir=@privincludedir@ Name: evolution-addressbook Description: libraries needed for Evolution addressbook backends Version: @VERSION@ Requires: gconf-2.0 libbonobo-2.0 gal-2.0 >= @GAL_VERSION@ libgnome-2.0 camel = @VERSION@ -Libs: -L${libdir} -L${privlibdir} -lpas -lebook -lename -lversit -Cflags: -I${includedir}/evolution +Libs: -L${privlibdir} -lpas -lebook -lename -lversit +Cflags: -I${privincludedir} diff --git a/evolution-calendar.pc.in b/evolution-calendar.pc.in index d4478294a4..7891596420 100644 --- a/evolution-calendar.pc.in +++ b/evolution-calendar.pc.in @@ -7,10 +7,11 @@ idldir=@idldir@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ privlibdir=@privlibdir@ +privincludedir=@privincludedir@ Name: evolution-calendar Description: libraries needed for Evolution calendar backends Version: @VERSION@ Requires: libgnome-2.0 libbonobo-2.0 gal-2.0 >= @GAL_VERSION@ gnome-vfs-2.0 -Libs: -L${libdir} -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil -Cflags: -I${includedir}/evolution +Libs: -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil +Cflags: -I${privincludedir} diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in index 72909b41bb..db3a13fa51 100644 --- a/evolution-shell.pc.in +++ b/evolution-shell.pc.in @@ -6,10 +6,11 @@ includedir=@includedir@ privlibdir=@privlibdir@ privlibexecdir=@privlibexecdir@ +privincludedir=@privincludedir@ idldir=@idldir@ componentdir=@componentdir@ evolutionuidir=@evolutionuidir@ -iconsdir=@iconsdir@ +imagesdir=@imagesdir@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ @@ -17,5 +18,5 @@ Name: evolution-shell Description: libraries needed for Evolution shell components Version: @VERSION@ Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= @GAL_VERSION@ -Libs: -L${libdir} -leshell -Cflags: -I${includedir}/evolution +Libs: -L${privlibdir} -leshell +Cflags: -I${privincludedir} -- cgit v1.2.3