flashplugin: fix filename and Makefile multiarch support

Makefile

@@ -97,11 +97,11 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
 .SUFFIXES: .in .po .mo
 
 .in:; @echo "generating $@..."; \
-       [ "$(ARCH)" != "x86_64" ] && ARCH=i386; \
+       if [ "$(ARCH)" != "x86_64" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
        sed "s,@distroID@,$(DISTROID),g;\
             s,@distroid@,$(DISTROid),g;\
             s,@distroicon@,$(DISTROICON),g;\
-            s,@arch@,$(ARCH),g;\
+            s,@arch@,$$ARCH,g;\
             s,@distribution@,$(RPM_DISTRIBUTION),g;\
             s,@distroext@,$(RPM_DISTROEXT),g;\
             s,@vendor@,$(RPM_VENDOR),g;\

SRPMS/flashplugin/distroutils.sysconfig.in

@@ -1,7 +1,7 @@
 ## Adobe Flash Plugin
 
 # package name (do not modify unless you know what you're doing)
-FLASH_PLUGIN_PCK=install_flash_player_11_linux_@arch@.tar.gz
+FLASH_PLUGIN_PCK=install_flash_player_11_linux.@arch@.tar.gz
 
 # package URL (do not modify unless you know what you're doing)
 FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/