From b5aa9a1b0a6bb27e88752ddaec39dba9f697c4e3 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 4 Feb 2013 19:06:31 +0100 Subject: [PATCH] flashplugin: fix filename and Makefile multiarch support --- Makefile | 4 ++-- SRPMS/flashplugin/distroutils.sysconfig.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dd663f3..1e7297c 100644 --- a/Makefile +++ b/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;\ diff --git a/SRPMS/flashplugin/distroutils.sysconfig.in b/SRPMS/flashplugin/distroutils.sysconfig.in index 4160662..25eed71 100644 --- a/SRPMS/flashplugin/distroutils.sysconfig.in +++ b/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}/