2003-10-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Makefile.in:
	* autogen.sh:
	* configure.in:
	* doc/Makefile.in:
	* server/Makefile.in:
	* test/Makefile.in: added 'dist' target to make a tarball.

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

ChangeLog

@@ -1,3 +1,12 @@
+2003-10-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Makefile.in:
+	* autogen.sh:
+	* configure.in:
+	* doc/Makefile.in:
+	* server/Makefile.in:
+	* test/Makefile.in: added 'dist' target to make a tarball.
+
 2003-09-27  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* server/XSPApplicationHost.cs: really add the sponsors now.

Makefile.in

@@ -1,4 +1,7 @@
 SUBDIRS = server test doc
+NAME_VERSION=@PACKAGE_NAME@-@PACKAGE_VERSION@
+DIST_DIR="@abs_top_builddir@/$(NAME_VERSION)"
+TARFILE=$(NAME_VERSION).tar.gz
 
 .PHONY: all install clean uninstall dist
 
@@ -17,3 +20,8 @@ clean uninstall:
 		$(MAKE) -C $$i $@ || exit 1; \
 	done;
 
+dist:
+	$(MAKE) install DESTDIR=$(DIST_DIR) PREFIX=
+	rm -f $(TARFILE)
+	tar -czf $(TARFILE) $(NAME_VERSION)
+

autogen.sh

@@ -1,4 +1,3 @@
-automake -a
 aclocal
 autoconf
 ./configure $*

configure.in

@@ -1,7 +1,11 @@
 AC_PREREQ(2.57)
-PACKAGE = xsp
-VERSION = 0.5.99
-AC_INIT(NEWS)
+AC_INIT(server/server.cs)
+
+PACKAGE_NAME=xsp
+PACKAGE_VERSION=0.5.99
+
+AC_SUBST(PACKAGE_NAME)
+AC_SUBST(PACKAGE_VERSION)
 
 AC_PROG_INSTALL
 

doc/Makefile.in

@@ -1,7 +1,9 @@
 DESTDIR=
+PREFIX=@prefix@
+MKINSTALLDIRS=@top_builddir@mkinstalldirs 
 
 MANPAGES= xsp.1
-MANDIR = $(DESTDIR)@prefix@/man/man1 
+MANDIR = $(DESTDIR)$(PREFIX)/man/man1 
 
 .PHONY: all install clean uninstall
 
@@ -10,9 +12,9 @@ all:
 clean:
 
 install:
-	@top_builddir@mkinstalldirs $(MANDIR)
+	$(MKINSTALLDIRS) $(MANDIR)
 	cp $(MANPAGES) $(MANDIR)
 
 uninstall:
-	-test -d $(DESTDIR)@prefix@/man/man1 && cd $(MANDIR) && rm -f $(MANPAGES)
+	-test -d $(DESTDIR)$(PREFIX)/man/man1 && cd $(MANDIR) && rm -f $(MANPAGES)
 

server/Makefile.in

@@ -1,5 +1,8 @@
 MCS=@MCS@
 MCSFLAGS+= -debug+ -debug:full -nologo
+PREFIX=@prefix@
+DESTDIR=
+MKINSTALLDIRS=@top_builddir@mkinstalldirs 
 
 # 
 XSP_REFERENCES= System.Web
@@ -26,14 +29,14 @@ MODMONO_SERVER_SOURCES =  IApplicationHost.cs \
 			  server.cs
 
 EXES = xsp.exe mod-mono-server.exe
-LOCAL_BIN_DIR=$(DESTDIR)@prefix@/bin
+LOCAL_BIN_DIR=$(DESTDIR)$(PREFIX)/bin
 
 .PHONY: all install clean uninstall trace
 
 all: $(EXES)
 
 install: $(EXES)
-	@top_builddir@mkinstalldirs $(LOCAL_BIN_DIR)
+	$(MKINSTALLDIRS) $(LOCAL_BIN_DIR)
 	cp $(EXES) $(LOCAL_BIN_DIR)
 
 xsp.exe: $(XSP_SOURCES)

test/Makefile.in

@@ -1,29 +1,35 @@
 MCS=@MCS@
+PREFIX=@prefix@
+DESTDIR=
+MKINSTALLDIRS=@top_builddir@mkinstalldirs 
 
 %.dll: %.cs
 	$(MCS) -r:System.Web.dll -target:library -out:$@ $^
 
 DLLS = tabcontrol.dll tabcontrol2.dll codebehind1.dll extensions.dll 
 EXES = ServiceClient.exe
-SAMPLES_DIR = $(DESTDIR)@prefix@/share/doc/xsp/test
+SAMPLES_DIR = $(DESTDIR)$(PREFIX)/share/doc/xsp/test
+SAMPLES_BIN_DIR = $(DESTDIR)$(PREFIX)/share/doc/xsp/test/bin
 
-EVERYTHING = $(DLLS) \
-	     $(EXES) \
+EVERYTHING = $(EXES) \
 	     *.aspx \
 	     *.ascx \
 	     *.asmx \
 	     *.ashx \
 	     *.config \
 	     *.asax \
-	     *.xml
+	     *.xml \
+	     *.png
 
 .PHONY: all install clean uninstall
 
 all: $(DLLS) $(EXES)
 
-install: $(EVERYTHING)
-	@top_builddir@mkinstalldirs $(SAMPLES_DIR)
+install: $(EVERYTHING) $(DLLS)
+	$(MKINSTALLDIRS) $(SAMPLES_DIR)
 	cp $(EVERYTHING) $(SAMPLES_DIR)
+	$(MKINSTALLDIRS) $(SAMPLES_BIN_DIR)
+	cp $(DLLS) $(SAMPLES_BIN_DIR)
 
 uninstall:
 	-test -d $(SAMPLES_DIR) && cd $(SAMPLES_DIR) && rm -f $(EVERYTHING)