* server/Makefile.in (LOCAL_BIN_DIR):

* test/Makefile.in (SAMPLES_DIR, SAMPLES_BIN_DIR): Use
$(DESTDIR)$(prefix) instead of @prefix@. This is needed for the
build system.

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

ChangeLog

@@ -1,3 +1,10 @@
+2003-11-17  Duncan Mak  <duncan@ximian.com>
+
+	* server/Makefile.in (LOCAL_BIN_DIR):
+	* test/Makefile.in (SAMPLES_DIR, SAMPLES_BIN_DIR): Use
+	$(DESTDIR)$(prefix) instead of @prefix@. This is needed for the
+	build system.
+
 2003-11-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* doc/xsp.1: updated.

server/Makefile.in

@@ -28,7 +28,7 @@ MODMONO_ONLY= ModMonoRequest.cs \
 MODMONO_SERVER_SOURCES =  $(COMMON_SOURCES) $(MODMONO_ONLY:.in=)
 
 EXES = xsp.exe mod-mono-server.exe
-LOCAL_BIN_DIR=@prefix@/bin
+LOCAL_BIN_DIR=$(DESTDIR)$(prefix)/bin
 
 .PHONY: all install clean uninstall trace
 

test/Makefile.in

@@ -6,8 +6,8 @@ MKINSTALLDIRS=@top_builddir@mkinstalldirs
 
 DLLS = tabcontrol.dll tabcontrol2.dll codebehind1.dll extensions.dll 
 EXES = ServiceClient.exe
-SAMPLES_DIR = @prefix@/share/doc/xsp/test
-SAMPLES_BIN_DIR = @prefix@/share/doc/xsp/test/bin
+SAMPLES_DIR = $(DESTDIR)$(prefix)/share/doc/xsp/test
+SAMPLES_BIN_DIR = $(DESTDIR)$(prefix)/share/doc/xsp/test/bin
 DISTFILES= *.aspx \
 	     *.ascx \
 	     *.asmx \
@@ -51,7 +51,7 @@ extensions.dll: TraceExtension.cs EncryptExtension.cs DumpExtension.cs
 ServiceClient.exe: extensions.dll ServiceClient.cs Reference.cs
 	$(MCS) -r:System.Web.dll -r:System.Web.Services.dll -r:extensions.dll \
 		ServiceClient.cs Reference.cs
-	
+
 clean:
 	rm -f *.dll *~ *.pdb