From 54a9260f696f5c7462f40af8f838d723ba3abeb5 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Sun, 3 Jun 2007 14:50:35 +0000
Subject: Fix for version removal from installed files.

svn path=/trunk/; revision=33646
---
 shell/Makefile.am | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'shell/Makefile.am')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4b671f52aa..8eef0ef0df 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -96,10 +96,10 @@ eshellinclude_HEADERS = 			\
 	es-event.h				\
 	es-menu.h
 
-libeshell_la_SOURCES = 				\
+libeshell_la_SOURCES =				\
 	$(IDL_GENERATED)			\
 	$(MARSHAL_GENERATED)			\
-	e-component-view.c		\
+	e-component-view.c			\
 	evolution-component.c			\
 	evolution-listener.c			\
 	e-shell-utils.c				\
@@ -176,14 +176,14 @@ libevolution_test_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 if ENABLE_TEST_COMPONENT
 testserver_in_files = GNOME_Evolution_Test.server.in.in
-testserver_DATA = $(testserver_in_files:.server.in.in=_$(BASE_VERSION).server)
+testserver_DATA = $(testserver_in_files:.server.in.in=.server)
 testserverdir = $(serverdir)
 endif
 
 # Misc stuff
 
 server_in_files = GNOME_Evolution_Shell.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
@@ -198,10 +198,8 @@ glade_DATA =						\
 # GConf schemas
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_shell.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps_evolution_shell.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -227,16 +225,10 @@ endif
 
 install-evolution:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution$(EXEEXT) $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)$(EXEEXT)
-if DEFAULT_BINARY
-	cd $(DESTDIR)$(bindir) && rm -f evolution$(EXEEXT) && $(LN_S) evolution-$(BASE_VERSION)$(EXEEXT) evolution$(EXEEXT)
-endif
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution$(EXEEXT) $(DESTDIR)$(bindir)/evolution$(EXEEXT)
 
 uninstall-evolution:
-	$(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)$(EXEEXT)
-if DEFAULT_BINARY
-	rm -f $(DESTDIR)$(bindir)/evolution$(EXEEXT)
-endif
+	$(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution$(EXEEXT)
 
 if HAVE_DTAPPINTEGRATE
 
-- 
cgit v1.2.3