2008-10-01 Miguel de Icaza <miguel@novell.com>

* Fix the scripts, my previous commit was untested, and some
	scripts ended up not pointing to the right place (xsp was trying
	to call 2.0/xsp.exe instead of 2.0/xsp2.exe and xsp1 was trying to
	call 1.0/xsp1.exe instead of 1.0/xsp.exe).

	Fixes #431121

svn path=/trunk/xsp/; revision=114545

ChangeLog

@@ -1,3 +1,12 @@
+2008-10-01  Miguel de Icaza  <miguel@novell.com>
+
+	* Fix the scripts, my previous commit was untested, and some
+	scripts ended up not pointing to the right place (xsp was trying
+	to call 2.0/xsp.exe instead of 2.0/xsp2.exe and xsp1 was trying to
+	call 1.0/xsp1.exe instead of 1.0/xsp.exe).
+
+	Fixes #431121
+
 2008-09-21  Miguel de Icaza  <miguel@novell.com>
 
 	* scripts/Makefile.am ($(tool_scripts)): Follow the naming pattern

scripts/Makefile.am

@@ -23,26 +23,26 @@ plat_tooldir2 = $(prefix)/lib/xsp/2.0
 
 REWRITE = sed \
 	-e 's,@''plat_bindir@,$(plat_bindir),g'		\
-	-e 's,@''exe_file@,$@.exe,g'			\
+	-e 's,@''exe_file@,'`basename $@ 1`'.exe,g'	\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'
 
 REWRITE2 = sed \
 	-e 's,@''plat_bindir@,$(plat_bindir2),g'		\
-	-e 's,@''exe_file@,$@.exe,g'				\
+	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'				\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'
 
 REWRITE_TOOLS = sed \
 	-e 's,@''plat_bindir@,$(plat_tooldir),g'		\
-	-e 's,@''exe_file@,$@.exe,g'			\
+	-e 's,@''exe_file@,'`basename $@ 1`'.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'
 
-REWRITE_TOOLS2 = sed \
+REWRITE_TOOLS2 = echo dd $@ dd; sed \
 	-e 's,@''plat_bindir@,$(plat_tooldir2),g'		\
-	-e 's,@''exe_file@,$@.exe,g'				\
+	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'
 
 $(bin1_scripts): $(srcdir)/script.in Makefile.am
-	$(REWRITE) $(srcdir)/script.in > $@.tmp
+	e=`basename $@ 1`; $(REWRITE) $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
 
 $(tool1_scripts): $(srcdir)/script.in Makefile.am