aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 22:50:35 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 22:50:35 +0800
commit54a9260f696f5c7462f40af8f838d723ba3abeb5 (patch)
treeab87ece78582288b7dabf6635fe3f393fd042c4d /calendar/gui
parentb484ae1c53ce5e8075eefe907cffbcb936106397 (diff)
downloadgsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.tar.gz
gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.tar.zst
gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.zip
Fix for version removal from installed files.
svn path=/trunk/; revision=33646
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/Makefile.am8
-rw-r--r--calendar/gui/alarm-notify/Makefile.am2
2 files changed, 4 insertions, 6 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index bd0601b264..efb573ebce 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -244,17 +244,15 @@ libevolution_calendar_la_LIBADD = \
libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
server_in_files = GNOME_Evolution_Calendar.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@
# GConf schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_calendar.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_calendar.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 8b9be3d141..cd1b638fb6 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -54,7 +54,7 @@ evolution_alarm_notify_LDADD = \
$(EVOLUTION_CALENDAR_LIBS)
server_in_files = GNOME_Evolution_Calendar_AlarmNotify.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@
d>2008-05-204-0/+55 * Mark xorg-server-snap as DEPRECATED and set EXPIRATION_DATE to next month.flz2008-05-201-0/+2 * Retire xorg-printserver.flz2008-05-165-972/+0 * - Remove unneeded dependency from gtk12/gtk20 [1]miwi2008-04-207-11/+12 * - Auto-detect and use native extended PS/2 protocols with the latest psm(4).jkim2008-04-163-33/+102 * Fix mouse probing issues with HAL support:jkim2008-04-023-1/+154 * - Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORGmiwi2008-03-261-1/+1 * Add inputproto and xtrans to USE_XORG.flz2008-03-151-2/+3 * Add inputproto and xtrans to USE_XORG.flz2008-03-151-2/+3 * Add patch that fixes xmodmap use in .xinitrc.flz2008-03-132-1/+148 * Remove support for XFree8-4.flz2008-03-0850-2241/+0 * - Check correct POSIX spec. date for clock_gettime(2) whetherjkim2008-03-063-1/+26 * Fix xserver multiple vulnerabilities.flz2008-01-232-1/+516 * - Add local patch to fix alpha build. [1]flz2008-01-023-2/+40 * - OPTIONS'ify.flz2007-12-133-1/+40 * - OPTIONS'ify (HAL, AIGLX, SUID).flz2007-12-131-20/+24 * Fix plist for sparc64. Should be a no-op on other archs, but bumplinimon2007-11-202-13/+14 * Add temporary fix for LEDs. Proper fix will be available in nextflz2007-10-292-1/+21 * Restore default optimization on RELENG_7.flz2007-10-241-4/+0 * - Explicit some configure arguments.flz2007-10-101-11/+7 * Change to new x11-drivers category.nork2007-10-069-382/+0 * Teach xorg-server that FreeBSD >= 700053 supports PCI domains andmarius2007-09-303-0/+395 * Switch autoconf dependencies from 2.53 or 2.59 to 2.61.linimon2007-09-301-2/+2 * - Update X.org ports to 7.3.flz2007-09-1427-406/+147 * - Consistencify descriptionsdanfe2007-07-031-4/+2 * Fix missing Xlibs dependency.danfe2007-07-031-0/+1 * - Fix the build with recent GCC [1]danfe2007-07-013-10/+135 * Band-aid over memory hungry gcc 4.2 when compiling xf86ScanPci.c.lesi2007-06-222-0/+15 * Clenup share/X11 directory upon deinstall.lesi2007-05-312-0/+2 * xorg-fontserver moved from x11-servers to x11-fonts (xfs).flz2007-05-209-160/+0 * - Welcome X.org 7.2 \o/.flz2007-05-20105-3671/+1156 * Fix loading modules on current by adding patch from devel/imake-6 sincelesi2007-02-232-1/+40 * Add vendor patch preventing overwiting of data on the stack or otherlesi2007-01-282-1/+9 * Respect X11BASE.laszlof2006-12-011-0/+5 * - Fix install with Xorg 6.9.0, unbreakpav2006-11-193-14/+31 * Add some old internal FreeType definitions to fix the server runtime. Thesemarcus2006-10-221-1/+4 * Remove the FreeType EXTRA_PATCHES now that they are in XFree86-4-libraries.marcus2006-10-183-12/+3 * Chase the GNOME X11BASE to LOCALBASE move, and fix the build with themarcus2006-10-1414-4/+789 * BROKEN: Does not installkris2006-09-171-0/+2 * NO_PACKAGE is not appropriatekris2006-09-031-1/+0 * Fix crash by bad pcf font.lesi2006-08-265-1/+100 * Fix crash by bad pcf font.lesi2006-08-267-4/+107 * - Add support to Intel 945GMmnag2006-08-212-1/+336 * - s,INSTALLS_SHLIB,USE_LDCONFIG,gclsung2006-08-151-1/+1 * Update to 0.14.6.nork2006-08-133-41/+50 * Update to 1.7.2erwin2006-06-242-5/+5 * Add a better workaround for LP64 bug in ProcRenderCompositeGlyphs() inlesi2006-06-052-1/+12 * Update to 1.71arved2006-05-292-6/+9 * Remove USE_REINPLACE from categories starting with Xedwin2006-05-131-1/+0 * Add my patch for buffer overflow in the Render extension's TriFan/TriStripanholt2006-05-036-1/+30 * Complete removal of cfb from sunffb driver as was done post release inlesi2006-04-20