diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-07 02:13:57 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-07 02:13:57 +0800 |
| commit | 3a315cf4f36f13f791b6b728531ba4704c13b186 (patch) | |
| tree | 9374efc1f74f0873e441ddcbb064f4841be43c45 /libical/src | |
| parent | db141482ef299e20092600972a6f328cb3eac878 (diff) | |
| download | gsoc2013-evolution-3a315cf4f36f13f791b6b728531ba4704c13b186.tar.gz gsoc2013-evolution-3a315cf4f36f13f791b6b728531ba4704c13b186.tar.zst gsoc2013-evolution-3a315cf4f36f13f791b6b728531ba4704c13b186.zip | |
AC_SUBST privlibdir, privincludedir, privdatadir (sent from ../configure).
* configure.in: AC_SUBST privlibdir, privincludedir, privdatadir
(sent from ../configure). Add descriptions to AC_DEFINEs. Don't
bother checking for python since we don't build it anyway.
* acconfig.h: Gone
* src/libical/Makefile.am: install library in privlibdir and
headers under privincludedir. Look for zone files in privdatadir
* src/libicalvcal/Makefile.am: install in privlibdir
* zoneinfo/Makefile.am (zoneinfodatadir): define in terms of
privdatadir
(install-data-local): update
svn path=/trunk/; revision=19823
Diffstat (limited to 'libical/src')
| -rw-r--r-- | libical/src/libical/Makefile.am | 8 | ||||
| -rw-r--r-- | libical/src/libicalvcal/Makefile.am | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am index e8075d58d9..656ffbcdae 100644 --- a/libical/src/libical/Makefile.am +++ b/libical/src/libical/Makefile.am @@ -2,7 +2,7 @@ # FILE: Makefile.am # CREATOR: eric # -# $Id: Makefile.am,v 1.33 2001/10/30 01:49:30 damon Exp $ +# $Id: Makefile.am,v 1.34 2003/02/06 18:13:56 danw Exp $ # # # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -26,7 +26,7 @@ DESIGNDATA = $(top_srcdir)/design-data ICALSCRIPTS = $(top_srcdir)/scripts -lib_LTLIBRARIES = libical-evolution.la +privlib_LTLIBRARIES = libical-evolution.la noinst_LTLIBRARIES = libical-static.la libical_static_la_SOURCES = $(libical_evolution_la_SOURCES) @@ -36,7 +36,7 @@ YFLAGS = -d -v -t -pical_yy LFLAGS = -Pical_yy LEX_OUTPUT_ROOT = lex.ical_yy -CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\" +CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\" all: ical.h @@ -99,7 +99,7 @@ libical_evolution_la_SOURCES = \ icallangbind.c #libicalincludedir = $(includedir)/$(PACKAGE) -libicalincludedir = $(includedir)/evolution +libicalincludedir = $(privincludedir) libicalinclude_HEADERS = ical.h diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am index e8e8310941..f9d8dd39d9 100644 --- a/libical/src/libicalvcal/Makefile.am +++ b/libical/src/libicalvcal/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libicalvcal-evolution.la +privlib_LTLIBRARIES = libicalvcal-evolution.la INCLUDES = \ -I$(top_builddir) \ @@ -19,7 +19,7 @@ libicalvcal_evolution_la_SOURCES = \ vcaltmp.h \ vcaltmp.c -#libicalvcalincludedir = $(includedir)/evolution/libicalvcal +#libicalvcalincludedir = $(privincludedir)/libicalvcal #libicalvcalinclude_HEADERS = \ # icalvcal.h \ |