callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subst in Evolution install variables.

Browse Source 
2002-09-12  Hans Petter Jansson  <hpj@ximian.com>

	* configure.in: Subst in Evolution install variables.

	* src/libical/Makefile.am (CPPFLAGS): Use Evolution's privdatadir.

svn path=/trunk/; revision=22553
This commit is contained in:
Hans Petter Jansson
2003-09-12 18:14:01 +00:00
committed by Hans Petter
parent 8b364a6d16
commit 431f07549f
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libical/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-12 Hans Petter Jansson <hpj@ximian.com>
* configure.in: Subst in Evolution install variables.
* src/libical/Makefile.am (CPPFLAGS): Use Evolution's privdatadir.
2002-07-09 Andrea Campi <a.campi@inet.it>
* src/libical/icalcomponent.c

9
libical/configure.in
View File

@ -5,6 +5,15 @@ AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(libical,0.24)
AM_CONFIG_HEADER(config.h)
dnl Set the aux dir to .. (the toplevel evolution directory) so ylwrap
dnl is found in the correct directory for automake >= 1.5
AC_CONFIG_AUX_DIR(..)
dnl Subst in evolution's private directories
AC_SUBST(privlibdir)
AC_SUBST(privincludedir)
AC_SUBST(privdatadir)
dnl Initialize maintainer mode
AM_MAINTAINER_MODE

4
libical/src/libical/Makefile.am
View File

@ -2,7 +2,7 @@
# FILE: Makefile.am
# CREATOR: eric
#
# $Id: Makefile.am,v 1.36 2003/09/11 22:04:19 hansp Exp $
# $Id: Makefile.am,v 1.37 2003/09/12 18:14:01 hansp Exp $
#
#
# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@ -40,7 +40,7 @@ noinst_LTLIBRARIES = libical-static.la
libical_static_la_SOURCES = $(libical_la_SOURCES)
libical_static_la_LDFLAGS = --all-static
CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"
# CFLAGS = -g