projects / platform / upstream / evolution-data-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3bc7bc)
clean up priv* dirs
authorJP Rosevear <jpr@ximian.com>
Thu, 6 Nov 2003 14:17:08 +0000 (14:17 +0000)
committerJP Rosevear <jpr@src.gnome.org>
Thu, 6 Nov 2003 14:17:08 +0000 (14:17 +0000)
2003-11-06  JP Rosevear <jpr@ximian.com>

* configure.in (BASE_VERSION): clean up priv* dirs

* src/Makefile.am: install a version binary to libexecdir

* src/GNOME_Evolution_DataServerLDAP.server.in.in: reflect new
binary location

* src/GNOME_Evolution_DataServerNOLDAP.server.in.in: ditto

ChangeLog patch | blob | history
addressbook/libedata-book/.cvsignore patch | blob | history
calendar/libedata-cal/.cvsignore patch | blob | history
configure.in patch | blob | history
src/GNOME_Evolution_DataServerLDAP.server.in.in patch | blob | history
src/GNOME_Evolution_DataServerNOLDAP.server.in.in patch | blob | history
src/Makefile.am patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index fdba7a4..42129ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-06  JP Rosevear <jpr@ximian.com>
+       
+       * configure.in (BASE_VERSION): clean up priv* dirs 
+       
+       * src/Makefile.am: install a version binary to libexecdir
+
+       * src/GNOME_Evolution_DataServerLDAP.server.in.in: reflect new
+       binary location
+
+       * src/GNOME_Evolution_DataServerNOLDAP.server.in.in: ditto
+       
 2003-11-05  JP Rosevear <jpr@ximian.com>
 
        * src/server.c: following renaming of libedata-book
diff --git a/addressbook/libedata-book/.cvsignore b/addressbook/libedata-book/.cvsignore
index 8ca0800..96ed214 100644 (file)
--- a/addressbook/libedata-book/.cvsignore
+++ b/addressbook/libedata-book/.cvsignore
@@ -6,4 +6,4 @@ Evolution-DataServer-Addressbook-stubs.c
 Evolution-DataServer-Addressbook.h
 e-data-book-marshal.c
 e-data-book-marshal.h
-libedatabook-1.0.pc
+libedata-book-1.0.pc
diff --git a/calendar/libedata-cal/.cvsignore b/calendar/libedata-cal/.cvsignore
index d70d0bc..5534bff 100644 (file)
--- a/calendar/libedata-cal/.cvsignore
+++ b/calendar/libedata-cal/.cvsignore
@@ -4,4 +4,4 @@ Evolution-DataServer-Calendar-common.c
 Evolution-DataServer-Calendar-skels.c
 Evolution-DataServer-Calendar-stubs.c
 Evolution-DataServer-Calendar.h
-libedatacal-1.0.pc
\ No newline at end of file
+libedata-cal-1.0.pc
\ No newline at end of file
diff --git a/configure.in b/configure.in
index c7bb855..8783a66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# Process this file with autoconf to produce a configure script.
+ Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
 AC_INIT(evolution-data-server, 0.0.1)
@@ -603,20 +603,18 @@ dnl --- If you add something here, consider whether or not you also
 dnl --- need to add it to one or more .pc.in files (for Connector,
 dnl --- etc)
 
-BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'`
+dnl BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'`
+BASE_VERSION=1.0
 AC_SUBST(BASE_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
 
-privlibexecdir='${libexecdir}'/evolution/$BASE_VERSION
-AC_SUBST(privlibexecdir)
-
-privdatadir='${datadir}'/evolution-data-server-1.0
+privdatadir='${datadir}'/evolution-data-server-$BASE_VERSION
 AC_SUBST(privdatadir)
 
-privincludedir='${includedir}'/evolution-data-server-1.0
+privincludedir='${includedir}'/evolution-data-server-$BASE_VERSION
 AC_SUBST(privincludedir)
 
-idldir="$datadir/idl/evolution-data-server-1.0"
+idldir="$datadir/idl/evolution-data-server-$BASE_VERSION"
 AC_SUBST(idldir)
 
 serverdir="$libdir/bonobo/servers"
@@ -630,7 +628,7 @@ INTERFACE_VERSION="$BASE_VERSION"
 AC_SUBST(INTERFACE_VERSION)
 AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "INTERFACE_VERSION", [IDL interface version (Major.Minor)])
 
-EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
+EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
 EVO_NAME_SERVER_RULE='%_$(BASE_VERSION).server: %.server ; mv $< $@'
 AC_SUBST(EVO_SUBST_SERVER_RULE)
 AC_SUBST(EVO_NAME_SERVER_RULE)
diff --git a/src/GNOME_Evolution_DataServerLDAP.server.in.in b/src/GNOME_Evolution_DataServerLDAP.server.in.in
index 953e412..c77e6bc 100644 (file)
--- a/src/GNOME_Evolution_DataServerLDAP.server.in.in
+++ b/src/GNOME_Evolution_DataServerLDAP.server.in.in
@@ -2,7 +2,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory"
             type="exe"
-            location="@LIBEXECDIR@/evolution-data-server">
+            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
 
        <oaf_attribute name="repo_ids" type="stringv">
                <item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
@@ -21,7 +21,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory"
             type="exe"
-            location="@LIBEXECDIR@/evolution-data-server">
+            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
 
        <oaf_attribute name="repo_ids" type="stringv">
                <item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
@@ -39,7 +39,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck"
             type="exe"
-            location="@LIBEXECDIR@/evolution-data-server">
+            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
 
        <oaf_attribute name="repo_ids" type="stringv">
                <item value="IDL:GNOME/Evolution/ServerInterfaceCheck:1.0"/>
diff --git a/src/GNOME_Evolution_DataServerNOLDAP.server.in.in b/src/GNOME_Evolution_DataServerNOLDAP.server.in.in
index 8e5c495..28b0491 100644 (file)
--- a/src/GNOME_Evolution_DataServerNOLDAP.server.in.in
+++ b/src/GNOME_Evolution_DataServerNOLDAP.server.in.in
@@ -2,7 +2,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory"
             type="exe"
-            location="@LIBEXECDIR@/evolution-data-server">
+            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
 
        <oaf_attribute name="repo_ids" type="stringv">
                <item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
@@ -20,7 +20,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory"
             type="exe"
-            location="@LIBEXECDIR@/evolution-data-server">
+            location="@LIBEXECDIR@/evolution-data-server-@VERSION@>"
 
        <oaf_attribute name="repo_ids" type="stringv">
                <item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
@@ -38,7 +38,7 @@
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck"
             type="exe"
-            location="@LIBEXECDIR@/evolution-data-server">
+            location="@LIBEXECDIR@/evolution-data-server-@VERSION@>"
 
        <oaf_attribute name="repo_ids" type="stringv">
                <item value="IDL:GNOME/Evolution/ServerInterfaceCheck:1.0"/>
diff --git a/src/Makefile.am b/src/Makefile.am
index 6105723..67e061b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ $(IDL_GENERATED_H): $(IDLS)
 $(IDL_GENERATED_C): $(IDL_GENERATED_H)
 
 
-privlibexec_PROGRAMS = \
+noinst_PROGRAMS =      \
        evolution-data-server
 
 evolution_data_server_SOURCES = \
@@ -48,6 +48,11 @@ evolution_data_server_LDADD =                                                \
        $(top_builddir)/calendar/libedata-cal/libedata-cal.la           \
        $(E_DATA_SERVER_LIBS)
 
+install-evolution-data-server:
+       $(mkinstalldirs) $(DESTDIR)$(libexecdir)
+       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)
+
+
 if ENABLE_LDAP
 SERVER_IN_FILE=GNOME_Evolution_DataServerLDAP.server.in.in
 else
@@ -74,6 +79,8 @@ EXTRA_DIST =                                          \
 BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
+install-exec-local: install-evolution-data-server
+
 dist-hook:
        cd $(distdir); rm -f $(BUILT_SOURCES)
 
Domain: Service Framework / Uncategorized;