head	1.7;
access;
symbols
	RELEASE_8_3_0:1.7
	RELEASE_9_0_0:1.7
	RELEASE_7_4_0:1.7
	RELEASE_8_2_0:1.7
	RELEASE_6_EOL:1.7
	RELEASE_8_1_0:1.7
	RELEASE_7_3_0:1.7
	RELEASE_8_0_0:1.7
	RELEASE_7_2_0:1.7
	RELEASE_7_1_0:1.7
	RELEASE_6_4_0:1.7
	RELEASE_5_EOL:1.7
	RELEASE_7_0_0:1.7
	RELEASE_6_3_0:1.7
	PRE_XORG_7:1.7
	RELEASE_4_EOL:1.7
	RELEASE_6_2_0:1.7
	RELEASE_6_1_0:1.7
	RELEASE_5_5_0:1.7
	RELEASE_6_0_0:1.7
	RELEASE_5_4_0:1.7
	RELEASE_4_11_0:1.7
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.5
	RELEASE_4_8_0:1.5
	RELEASE_5_0_0:1.5
	RELEASE_4_7_0:1.5
	RELEASE_4_6_2:1.5
	RELEASE_4_6_1:1.5
	RELEASE_4_6_0:1.5
	RELEASE_5_0_DP1:1.5
	RELEASE_4_5_0:1.5
	RELEASE_4_4_0:1.5
	RELEASE_4_3_0:1.3
	RELEASE_4_2_0:1.1
	RELEASE_4_1_1:1.1;
locks; strict;
comment	@# @;


1.7
date	2004.12.18.02.13.42;	author mi;	state Exp;
branches;
next	1.6;

1.6
date	2004.11.19.21.36.45;	author mi;	state Exp;
branches;
next	1.5;

1.5
date	2001.06.14.21.20.34;	author mi;	state Exp;
branches;
next	1.4;

1.4
date	2001.05.02.20.35.43;	author mi;	state Exp;
branches;
next	1.3;

1.3
date	2001.03.29.21.32.14;	author mi;	state Exp;
branches;
next	1.2;

1.2
date	2001.02.07.22.36.12;	author mi;	state Exp;
branches;
next	1.1;

1.1
date	2000.07.20.11.55.54;	author nbm;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Don't install httpd.1 twice -- as tclhttpd.1 and as httpd.1.

Noticed by: pointyhat
Reported by: kris
@
text
@--- Makefile.in	Mon Aug 11 12:46:57 2003
+++ Makefile.in	Fri Dec 17 21:08:34 2004
@@@@ -124,3 +124,3 @@@@
 SERVER_ROOT = @@SERVER_ROOT@@
-htdocsdir = $(SERVER_ROOT)/htdocs
+htdocsdir = $(prefix)/share/@@PACKAGE@@@@VERSION@@
 
@@@@ -198,3 +198,3 @@@@
 CONFIGDIR = @@CONFIGDIR@@
-mkinstalldirs = $(SHELL) $(CONFIGDIR)/mkinstalldirs
+mkinstalldirs = mkdir -p
 CONFIG_CLEAN_FILES =
@@@@ -220,3 +220,3 @@@@
 
-all: binaries libraries doc
+all: libraries doc

@@@@ -236,3 +236,3 @@@@
 
-install: all install-binaries install-libraries install-doc
+install: all install-libraries install-doc
 
@@@@ -330,1 +330,1 @@@@
-	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/httpd.1
+	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/tclhttpd.1
@@@@ -335,7 +335,4 @@@@
 
 install-doc: install-htdocs
-	@@echo "Installing man page"
-	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/httpd.1
 	@@echo "Installing README"
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(SERVER_ROOT)
@@@@ -343,5 +343,5 @@@@
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(cryptlibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir)
+	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir)
 
 clean:  
@


1.6
log
@Upgrade devel/tcllib from 1.6 to 1.7 and www/tclhttpd from 3.4.2 to 3.5.1.
Update dependency lines in amsn and tclxml.
@
text
@d1 2
a2 2
--- Makefile.in	Wed Apr 26 16:35:29 2000
+++ Makefile.in	Thu Jun 14 17:02:56 2001
d26 8
@


1.5
log
@The better fix for ports/27337 is,  IMO, to also install the man-page as
tclhttpd.1 instead of the too generic (and usurped by Apache) httpd.1...
@
text
@a7 5
@@@@ -183,3 +183,3 @@@@
 TCL_GENERIC_DIR_NATIVE = @@TCL_GENERIC_DIR_NATIVE@@
-TCLSH_PROG = @@TCLSH_PROG@@
+TCLSH_PROG ?= tclsh8.3
 SHARED_BUILD = @@SHARED_BUILD@@
d26 2
a27 1
@@@@ -335,3 +335,3 @@@@
d29 2
a30 2
-	$(mkinstalldirs) $(pkglibdir) $(cryptlibdir) $(prefix)/bin $(htdocsdir) $(customdir)
+	$(mkinstalldirs) $(pkglibdir) $(prefix)/bin $(htdocsdir) $(customdir)
d32 1
@


1.4
log
@Upgrade to the version 3.3...
@
text
@d2 1
a2 1
+++ Makefile.in	Thu Apr 27 16:24:39 2000
d28 3
@


1.3
log
@The previous commit by sobomax fixed the build, but quite terribly broke
the install.  My version  used the  special Makefile  only to  build the
binary lib. The installation was done by the software's Makefile.

sobomax declared  the custom  Makefile.lib to  be _the_  Makefile, which
caused  the library  to be  installed into  /usr/lib :-)  and completely
missed the .tcl scripts, etc.

I'm restoring the  old behaviour with the build problem  fixed (I hope).
This version  will also help  tclhttpd find  its docRoot on  startup. It
will  also install  tclhttpd.rc.default instead  of tclhttpd.rc.  If the
latter does not exist, the former gets copied to create it.

Submitted by: bento (and fenner's script)
@
text
@d8 10
@


1.2
log
@Bring to the latest version. Link all of the little external libraries
needed by the tclhttpd into one file. I submitted this back in December,
but nobody cared since. Now I can commit this myself :)

PR:		ports/23310
Submitted by:	mi
@
text
@d18 5
@


1.1
log
@Add tclhttpd, a pure-Tcl implementation of a HTTP server.

PR:		ports/19870
Submitted by:	Mikhail Teterin <mi@@privatelabs.com>
@
text
@a17 5
@@@@ -315,3 +315,3 @@@@
 installdirs:
-	$(mkinstalldirs) $(pkglibdir) $(cryptlibdir) $(prefix)/bin $(htdocsdir)
+	$(mkinstalldirs) $(pkglibdir) $(prefix)/bin $(htdocsdir)
 
@

