diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-06 17:05:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-06 17:05:17 +0000 |
| commit | 21e3135bf7cd6038894c31a42d217504aab9a192 (patch) | |
| tree | 77e02414848b6cea8a6d1b7b51f3bfca73a9763f /pango/modules.c | |
| parent | 59f899b57621dc1c172c39ef990bc16ec2ef77d6 (diff) | |
| download | pango-21e3135bf7cd6038894c31a42d217504aab9a192.tar.gz | |
Fix problem where == was used instead if =. (#73694, Martin Gansser)
Wed Mar 6 11:43:46 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Fix problem where == was used instead if =.
(#73694, Martin Gansser)
* modules/Makefile.am (install-data-local): Simplify
the rule to create the pango.modules file to avoid
problems with differing shared library suffixes.
pango-querymodules run without any arguments does the
right thing by default. (#73694, Martin Gansser)
* configure.in: Add a PANGO_MODULE_VERSION variable
defining the subdir in which modules are installed.
* pango/querymodules.c pango/modules.c modules/*/*.am:
Install modules in lib/pango/MODULE_VERSION/modules
* pango.pc.in (pango_module_version): Export pango_module_version
variable so that 3rd parties can determine where to install
libraries.
Diffstat (limited to 'pango/modules.c')
| -rw-r--r-- | pango/modules.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/modules.c b/pango/modules.c index b4346f4c..9153341b 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -245,8 +245,8 @@ process_module_file (FILE *module_file) pair->load_info = g_strdup (tmp_buf->str); #if defined(G_OS_WIN32) && defined(LIBDIR) if (strncmp (pair->load_info, - LIBDIR "/pango/modules/", - strlen (LIBDIR "/pango/modules/")) == 0) + LIBDIR "/pango/" MODULE_VERSION "/modules/", + strlen (LIBDIR "/pango/" MODULE_VERSION "/modules/")) == 0) { /* This is an entry put there by make install on the * packager's system. On Windows a prebuilt Pango @@ -258,8 +258,8 @@ process_module_file (FILE *module_file) gchar *tem = pair->load_info; pair->load_info = g_strconcat (pango_get_lib_subdirectory (), - "\\modules\\", - tem + strlen (LIBDIR "/pango/modules/"), + "\\" MODULE_VERSION "\\modules\\", + tem + strlen (LIBDIR "/pango/" MODULE_VERSION "/modules/"), NULL); g_free (tem); } |