Executables called by INSTALL have different suffix for x86_64,

so make sure to call them with the correct name.
Thanks wiz for noting it

5 files changed, 17 insertions, 8 deletions

diff --git a/emulators/suse100_gtk2/INSTALL b/emulators/suse100_gtk2/INSTALL
index 625cf3099f8..ad34cc92f13 100644
--- a/emulators/suse100_gtk2/INSTALL
+++ b/emulators/suse100_gtk2/INSTALL
@@ -1,14 +1,14 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $
+# $NetBSD: INSTALL,v 1.2 2007/02/18 12:34:19 tonio Exp $
 #
 # Initialize gtk/pango module configuration.
 #
 case ${STAGE} in
     POST-INSTALL)
-        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0 > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
+        @EMULDIR@/opt/gnome/bin/gtk-query-immodules-2.0@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gtk.immodules
 
-        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
+        @EMULDIR@/opt/gnome/bin/gdk-pixbuf-query-loaders@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/gtk-2.0/gdk-pixbuf.loaders
 
-        @EMULDIR@/opt/gnome/bin/pango-querymodules > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
+        @EMULDIR@/opt/gnome/bin/pango-querymodules@BINSUFFIX@ > @EMULDIR@/etc/opt/gnome/pango/pango.modules                
 	;;
     *)
 	;;
diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile
index 61492350d66..4d72cffe424 100644
--- a/emulators/suse100_gtk2/Makefile
+++ b/emulators/suse100_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/30 16:20:23 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/18 12:34:20 tonio Exp $
 
 DISTNAME=		suse_gtk2-${SUSE_VERSION}
 PKGREVISION=		2
@@ -23,8 +23,11 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
 # Initialize gtk/pango modules.
 FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
+FILES_SUBST+=		BINSUFFIX=${BINSUFFIX:Q}
 PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if exists(Makefile.${MACHINE_ARCH})
 .include "Makefile.${MACHINE_ARCH}"
 .endif
diff --git a/emulators/suse100_gtk2/Makefile.i386 b/emulators/suse100_gtk2/Makefile.i386
index fe1fcee9c0a..98d51b9ea6e 100644
--- a/emulators/suse100_gtk2/Makefile.i386
+++ b/emulators/suse100_gtk2/Makefile.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.2 2006/06/06 14:53:06 salo Exp $
+# $NetBSD: Makefile.i386,v 1.3 2007/02/18 12:34:20 tonio Exp $
 
 RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
 			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
@@ -6,3 +6,5 @@ RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
 			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
 			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
 			pango-1.10.0-3.${SUSE_ARCH}.rpm
+
+BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.powerpc b/emulators/suse100_gtk2/Makefile.powerpc
index 497098bd564..6c718d8a3ab 100644
--- a/emulators/suse100_gtk2/Makefile.powerpc
+++ b/emulators/suse100_gtk2/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.2 2006/06/06 14:53:06 salo Exp $
+# $NetBSD: Makefile.powerpc,v 1.3 2007/02/18 12:34:20 tonio Exp $
 
 RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
 			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
@@ -6,3 +6,5 @@ RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
 			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
 			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
 			pango-1.10.0-3.${SUSE_ARCH}.rpm
+
+BINSUFFIX=
diff --git a/emulators/suse100_gtk2/Makefile.x86_64 b/emulators/suse100_gtk2/Makefile.x86_64
index 648e3ccecbb..fa263f315fe 100644
--- a/emulators/suse100_gtk2/Makefile.x86_64
+++ b/emulators/suse100_gtk2/Makefile.x86_64
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.x86_64,v 1.2 2006/06/06 14:53:06 salo Exp $
+# $NetBSD: Makefile.x86_64,v 1.3 2007/02/18 12:34:20 tonio Exp $
 
 RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
 			glib2-2.8.1-3.${SUSE_ARCH}.rpm \
@@ -6,3 +6,5 @@ RPMFILES=		atk-1.10.3-2.${SUSE_ARCH}.rpm \
 			cairo-1.0.0-7.4.${SUSE_ARCH}.rpm \
 			glitz-0.4.4-4.${SUSE_ARCH}.rpm \
 			pango-1.10.0-3.${SUSE_ARCH}.rpm
+
+BINSUFFIX=	-64