flashplugin: x86_64 plugin installation support

This commit is contained in:
Silvan Calarco 2013-02-04 15:24:02 +01:00
parent f49cad7a27
commit d104a8c9ec
2 changed files with 4 additions and 1 deletions

View File

@ -27,6 +27,7 @@ SCREENSAVER =
DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z) DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z)
DISTROICON = $(DISTROid) DISTROICON = $(DISTROid)
ARCH=`uname -i`
DESTDIR = DESTDIR =
@ -96,9 +97,11 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
.SUFFIXES: .in .po .mo .SUFFIXES: .in .po .mo
.in:; @echo "generating $@..."; \ .in:; @echo "generating $@..."; \
[ "$(ARCH)" != "x86_64" ] && ARCH=i386; \
sed "s,@distroID@,$(DISTROID),g;\ sed "s,@distroID@,$(DISTROID),g;\
s,@distroid@,$(DISTROid),g;\ s,@distroid@,$(DISTROid),g;\
s,@distroicon@,$(DISTROICON),g;\ s,@distroicon@,$(DISTROICON),g;\
s,@arch@,$(ARCH),g;\
s,@distribution@,$(RPM_DISTRIBUTION),g;\ s,@distribution@,$(RPM_DISTRIBUTION),g;\
s,@distroext@,$(RPM_DISTROEXT),g;\ s,@distroext@,$(RPM_DISTROEXT),g;\
s,@vendor@,$(RPM_VENDOR),g;\ s,@vendor@,$(RPM_VENDOR),g;\

View File

@ -1,7 +1,7 @@
## Adobe Flash Plugin ## Adobe Flash Plugin
# package name (do not modify unless you know what you're doing) # package name (do not modify unless you know what you're doing)
FLASH_PLUGIN_PCK=install_flash_player_11_linux_i386.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) # package URL (do not modify unless you know what you're doing)
FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/ FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/