diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2000-02-23 20:28:32 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2000-02-23 20:28:32 +0000 |
| commit | 39d583669b774e681e750913418ab4694e249fea (patch) | |
| tree | 11000ca774b4c59a247967e9b788f9d2fd5463f3 /x11/gnomecore | |
| parent | 208af7c664dbdd9562371b4d78ee6a68b60693d6 (diff) | |
Notes
Diffstat (limited to 'x11/gnomecore')
| -rw-r--r-- | x11/gnomecore/files/patch-ae | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 6612566069aa..1ea686cf1c6d 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -623,8 +623,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- panel/Makefile.in.orig Tue Mar 2 01:53:16 1999 -+++ panel/Makefile.in Sat Mar 6 17:59:42 1999 +--- panel/Makefile.in.orig Fri Dec 17 16:28:45 1999 ++++ panel/Makefile.in Wed Feb 23 13:50:04 2000 @@ -160,7 +160,7 @@ AUTOMAKE_OPTIONS = 1.3 @@ -633,9 +633,9 @@ +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) - bin_PROGRAMS = panel -@@ -180,7 +180,7 @@ - libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h panel-types.h + bin_PROGRAMS = panel +@@ -181,7 +181,7 @@ + libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h -libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) @@ -643,8 +643,8 @@ libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -202,7 +202,7 @@ - EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist +@@ -213,7 +213,7 @@ + EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING bad-applet.desktop bad-applet.goad -confexecdir = $(libdir) @@ -652,17 +652,21 @@ confexec_DATA = appletsConf.sh panelgnorbadir = $(sysconfdir)/CORBA/servers ---- smproxy/Makefile.in.orig Tue Mar 2 01:52:21 1999 -+++ smproxy/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - - - LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) +@@ -670,6 +670,7 @@ + sed -e 's?\@GNOME_LIBDIR\@?$(GNOME_LIBDIR)?g' \ + -e 's?\@GNOME_INCLUDEDIR\@?$(GNOME_INCLUDEDIR)?g' \ + -e 's?\@GNOMEGNORBA_LIBS\@?$(GNOMEGNORBA_LIBS)?g' \ ++ -e 's?\@VERSION\@?$(VERSION)?g' \ + < $(srcdir)/appletsConf.sh.in > appletsConf.tmp \ + && mv appletsConf.tmp appletsConf.sh + +--- panel/appletsConf.sh.in.orig Mon Feb 8 11:13:15 1999 ++++ panel/appletsConf.sh.in Wed Feb 23 13:52:32 2000 +@@ -4,3 +4,4 @@ + APPLETS_LIBDIR="@GNOME_LIBDIR@" + APPLETS_LIBS="-lpanel_applet @GNOMEGNORBA_LIBS@" + APPLETS_INCLUDEDIR="@GNOME_INCLUDEDIR@" ++MODULE_VERSION="applets-@VERSION@" --- applets/another_clock/Makefile.in.orig Sat Oct 16 13:03:28 1999 +++ applets/another_clock/Makefile.in Sat Oct 16 13:03:38 1999 @@ -153,7 +153,7 @@ |