From: Owen Taylor <otaylor@redhat.com>
Date: Sun, 3 Mar 2002 16:07:53 +0000 (+0000)
Subject: Fix install location.
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=8b4034d84317a1ae746ce22a83f3708c30ac7889

Fix install location.

Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/Makefile.am (moduledir): Fix
        install location.
---

diff --git a/ChangeLog b/ChangeLog
index b416f2abd..d48162491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b416f2abd..d48162491 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b416f2abd..d48162491 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b416f2abd..d48162491 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b416f2abd..d48162491 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b416f2abd..d48162491 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b416f2abd..d48162491 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Mar  3 11:05:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/input/Makefile.am (moduledir): Fix
+	install location.
+
 Sun Mar  3 10:28:32 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am: add missing dependency of objects on
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 97578c5ea..82876c33b 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -26,7 +26,7 @@ LDADDS = @STRIP_BEGIN@ 					\
 	@GTK_DEP_LIBS@					\
 @STRIP_END@
 
-moduledir = $(libdir)/gtk-2.0/immodules/$(GTK_BINARY_VERSION)
+moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
 
 im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_xim_la_SOURCES = 		\