diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/epiphany-1.4.pc.in (renamed from data/epiphany-1.2.pc.in) | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
5 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2004-03-21 Christian Persch <chpe@cvs.gnome.org> + + * configure.in: + * data/Makefile.am: + R data/epiphany-1.2.pc.in: + A data/epiphany-1.4.pc.in: + * src/Makefile.am: + + Make epiphany-extensions for epiphany 1.3 parallel-installable with those + for epiphany 1.2. + 2004-03-20 Guntupalli Karunakar <karunakar@freedomink.org> * configure.in: Added "pa" (Punjabi) to ALL_LINGUAS. diff --git a/configure.in b/configure.in index fd930cc54..0eaaf3985 100644 --- a/configure.in +++ b/configure.in @@ -229,7 +229,7 @@ GTK_DOC_CHECK([1.0]) AC_OUTPUT([ Makefile data/Makefile -data/epiphany-1.2.pc +data/epiphany-1.4.pc data/glade/Makefile data/art/Makefile data/ui/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index bda5a482c..0fc440e85 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -38,7 +38,7 @@ mimepermissiondir = $(pkgdatadir) mimepermission_DATA = mime-types-permissions.xml pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = epiphany-1.2.pc +pkgconfig_DATA = epiphany-1.4.pc install-data-local: if GCONF_SCHEMAS_INSTALL diff --git a/data/epiphany-1.2.pc.in b/data/epiphany-1.4.pc.in index b6d609006..dbe1637d4 100644 --- a/data/epiphany-1.2.pc.in +++ b/data/epiphany-1.4.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/epiphany-@EPIPHANY_MAJOR@ +extensionsdir=@libdir@/epiphany-@EPIPHANY_MAJOR@/extensions Name: Epiphany Browser Description: GNOME Web Browser diff --git a/src/Makefile.am b/src/Makefile.am index b4df30330..5b3dfa44b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ -I$(top_srcdir)/src/bookmarks \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DEXTENSIONS_DIR=\""$(libdir)/epiphany/extensions"\" \ + -DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" \ -DDATADIR=\""$(datadir)"\" \ -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" |