--- old/make/linux/makefiles/launcher.make	2010-09-22 14:08:34.637455879 +0200
+++ new/make/linux/makefiles/launcher.make	2010-09-22 14:08:34.329988789 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 
 # gamma[_g]: launcher
 
+LAUNCHER_SCRIPT = fusion
 LAUNCHER   = gamma
 LAUNCHER_G = $(LAUNCHER)$(G_SUFFIX)
 
@@ -66,7 +67,13 @@
 	echo '#include "java_md.c"'; \
 	} > $@
 
-$(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE)
+$(LAUNCHER_SCRIPT): $(LAUNCHERDIR)/launcher.script
+	$(QUIETLY) { \
+	sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@; \
+	chmod +x $@; \
+	}
+
+$(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE) $(LAUNCHER_SCRIPT)
 	$(QUIETLY) { \
 	    echo Linking launcher...; \
 	    $(LINK_LAUNCHER/PRE_HOOK) \