diff options
Diffstat (limited to 'deskutils/gnomepim/files/patch-ab')
| -rw-r--r-- | deskutils/gnomepim/files/patch-ab | 70 |
1 files changed, 23 insertions, 47 deletions
diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab index e7abc1a34e61..285308eaeea3 100644 --- a/deskutils/gnomepim/files/patch-ab +++ b/deskutils/gnomepim/files/patch-ab @@ -1,66 +1,42 @@ ---- gncal/Makefile.in.orig Mon Sep 27 16:05:44 1999 -+++ gncal/Makefile.in Mon Oct 4 14:13:16 1999 -@@ -118,9 +118,9 @@ - - SUBDIRS = doc +--- gncal/Makefile.in.orig Sat May 20 20:52:50 2000 ++++ gncal/Makefile.in Tue May 30 14:34:37 2000 +@@ -143,3 +143,3 @@ -help_base = $(datadir)/gnome/help/cal -+help_base = $(datadir)/help/cal ++help_base = $(datadir)/help/gnomecal --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" +@@ -148,3 +148,3 @@ +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - bin_PROGRAMS = gnomecal -@@ -138,7 +138,7 @@ - EXTRA_DIST = gncal.desktop bell.xpm recur.xpm +@@ -223,3 +223,3 @@ +-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits ++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits + @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) +@@ -235,3 +235,3 @@ -Productivitydir = $(datadir)/gnome/apps/Applications +Productivitydir = $(datadir)/apps/Applications - Productivity_DATA = gncal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -518,7 +518,7 @@ - - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(help_base)/C -+# $(mkinstalldirs) $(DESTDIR)$(help_base)/C - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- gnomecard/Makefile.in.orig Fri Sep 17 14:40:25 1999 -+++ gnomecard/Makefile.in Fri Sep 24 13:54:54 1999 -@@ -118,9 +118,9 @@ - - nSUBDIRS = help +--- gnomecard/Makefile.in.orig Sat May 20 20:52:58 2000 ++++ gnomecard/Makefile.in Tue May 30 14:35:44 2000 +@@ -137,5 +137,5 @@ -xpmhelp_base = $(datadir)/gnome/help/cal -+xpmhelp_base = $(datadir)/help/gnomecal ++xpmhelp_base = $(datadir)/help/cal --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I../../gcalendar -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I../../gcalendar +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar +@@ -185,3 +185,3 @@ - bin_PROGRAMS = gnomecard -@@ -145,7 +145,7 @@ - EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnome-card.xpm gnomecard.desktop gnomecard.gnorba - +-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits ++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits + @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) +@@ -194,3 +194,3 @@ -Productivitydir = $(datadir)/gnome/apps/Applications +Productivitydir = $(datadir)/apps/Applications - Productivity_DATA = gnomecard.desktop - ---- gnomecard/help/C/Makefile.in.orig Mon Sep 27 16:05:53 1999 -+++ gnomecard/help/C/Makefile.in Mon Oct 4 14:18:45 1999 -@@ -116,7 +116,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnomecard_helpdir = $(datadir)/gnome/help/gnomecard/C -+gnomecard_helpdir = $(datadir)/help/gnomecard/C - - gnomecard_help_DATA = index.html topic.dat - |