summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2007-06-27 18:20:12 +0000
committerChristian Neumair <cneumair@gnome.org>2007-06-27 18:20:12 +0000
commit6cd20c06d6cc65bc17fe0df777291f7bc137f6db (patch)
tree916e54e38fea396a5d8f889a89d71e9348f3b72f
parentf83d3563e4c5aa9eec04d2752a5b29cfd8bb59be (diff)
downloadshared-mime-info-6cd20c06d6cc65bc17fe0df777291f7bc137f6db.tar.gz
2007-06-27 Christian Neumair <cneumair@gnome.org>
* Makefile.am: Install shared-mime-info.pc to $libdir/pkgconfig instead of $datadir/pkgconfig, #10698. Thanks to Tilman Sauerbeck <tilman@code-monkey.de>. * autogen.sh: Don't run libtoolize, #10870. Thanks to Ville Skyttä <ville.skytta@iki.fi>.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e473f01..b72d4521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-06-27 Christian Neumair <cneumair@gnome.org>
+ * Makefile.am: Install shared-mime-info.pc to $libdir/pkgconfig
+ instead of $datadir/pkgconfig, #10698. Thanks to Tilman Sauerbeck
+ <tilman@code-monkey.de>.
+ * autogen.sh: Don't run libtoolize, #10870. Thanks to Ville Skyttä
+ <ville.skytta@iki.fi>.
+
+2007-06-27 Christian Neumair <cneumair@gnome.org>
+
* freedesktop.org.xml.in: Add more WordPerfect globs, #10428. Thanks
to Petr Mladek <pmladek@suse.cz>.
Also replace "document" by "image" in EMF/WMF description.
diff --git a/Makefile.am b/Makefile.am
index debe1588..4b3105dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = \
CLEANFILES = freedesktop.org.xml po/stamp-it
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = shared-mime-info.pc
$(pkgconfig_DATA): config.status
diff --git a/autogen.sh b/autogen.sh
index b4afff7b..1288bfe9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,7 +38,8 @@ do_cmd() {
$@
}
-do_cmd libtoolize --force --copy
+# not required for shared-mime-info, skip.
+# do_cmd libtoolize --force --copy
do_cmd intltoolize --force