Some paths adjustments for x86_64.

4 files changed, 14 insertions, 11 deletions

diff --git a/emulators/suse113_gtk2/DEINSTALL b/emulators/suse113_gtk2/DEINSTALL
index aca38a6daa1..6ca23d95bbd 100644
--- a/emulators/suse113_gtk2/DEINSTALL
+++ b/emulators/suse113_gtk2/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.2 2010/12/03 00:27:05 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.3 2011/01/01 03:48:54 obache Exp $
 #
 # Remove gtk/pango module configuration.
 #
@@ -8,9 +8,9 @@ DEINSTALL)
 	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc"
 
 	${ECHO} "${PKGNAME}: removing GTK/Pango module configuration"
-        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
+        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk@ABISUFFIX@.immodules
         ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
-        ${RM} -f ${GNOME_ETCDIR}/pango/pango.modules
+        ${RM} -f ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
 	${RM} -rf ${PKG_PREFIX}/@EMULSUBDIR@/var/cache/gio-2.0
 	${RM} -f ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
 	;;
diff --git a/emulators/suse113_gtk2/INSTALL b/emulators/suse113_gtk2/INSTALL
index 729d06c483e..d8f49bf6053 100644
--- a/emulators/suse113_gtk2/INSTALL
+++ b/emulators/suse113_gtk2/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2010/12/03 00:27:05 wiz Exp $
+# $NetBSD: INSTALL,v 1.3 2011/01/01 03:48:54 obache Exp $
 #
 # Initialize gtk/pango module configuration.
 #
@@ -9,9 +9,9 @@ POST-INSTALL)
 	SUSECONFIG="${PKG_PREFIX}/@EMULSUBDIR@/sbin/SuSEconfig"
 
 	${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration"
-        ${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk.immodules
+        ${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk@ABISUFFIX@.immodules
         ${GNOME_BINDIR}/gdk-pixbuf-query-loaders@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
-        ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango.modules
+        ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
 	PATH=${PKG_PREFIX}/@EMULSUBDIR@/bin ROOT=${PKG_PREFIX}/@EMULSUBDIR@ bash ${SUSECONFIG} --module glib2
 	${LN} -s /../var/db/dbus/machine-id ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
 	;;
diff --git a/emulators/suse113_gtk2/Makefile b/emulators/suse113_gtk2/Makefile
index 719c39a4475..15486fe4db2 100644
--- a/emulators/suse113_gtk2/Makefile
+++ b/emulators/suse113_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/12/03 00:27:05 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2011/01/01 03:48:54 obache Exp $
 
 DISTNAME=	suse_gtk2-${SUSE_VERSION}
 PKGREVISION=	1
@@ -25,11 +25,13 @@ COMMENT=	Linux compatibility package for GTK+-2.x
 EMUL_MODULES.linux=	fontconfig freetype2 jpeg png tiff x11
 
 # These files are managed by the +INSTALL/+DEINSTALL scripts.
-CHECK_FILES_SKIP+=	${EMULDIR}/etc/gtk-2.0/gtk.immodules
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/gtk-2.0/gtk${ABISUFFIX}.immodules
 CHECK_FILES_SKIP+=	${EMULDIR}/etc/gtk-2.0/gdk-pixbuf.loaders
-CHECK_FILES_SKIP+=	${EMULDIR}/etc/pango/pango.modules
+CHECK_FILES_SKIP+=	${EMULDIR}/etc/pango/pango${ABISUFFIX}.modules
 
+ABISUFFIX?=	# empty
 BINSUFFIX?=	# empty
+FILES_SUBST+=	ABISUFFIX=${ABISUFFIX:Q}
 FILES_SUBST+=	BINSUFFIX=${BINSUFFIX:Q}
 
 .include "../../emulators/suse113_linux/Makefile.common"
diff --git a/emulators/suse113_gtk2/suse.x86_64.mk b/emulators/suse113_gtk2/suse.x86_64.mk
index 0ef89997be7..6e15d0d05ec 100644
--- a/emulators/suse113_gtk2/suse.x86_64.mk
+++ b/emulators/suse113_gtk2/suse.x86_64.mk
@@ -1,4 +1,5 @@
-# $NetBSD: suse.x86_64.mk,v 1.1.1.1 2010/09/24 01:27:58 chs Exp $
+# $NetBSD: suse.x86_64.mk,v 1.2 2011/01/01 03:48:54 obache Exp $
 
 # Suffix on the GTK+-2.x/Pango binaries used in the INSTALL script
-BINSUFFIX=	-64
+ABISUFFIX=	64
+BINSUFFIX=	-${ABISUFFIX}