You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2013/07/03 00:02:45 UTC
svn commit: r1499130 - in /tcl/rivet/branches/2.1: ChangeLog INSTALL
Makefile.in
Author: mxmanghi
Date: Tue Jul 2 22:02:45 2013
New Revision: 1499130
URL: http://svn.apache.org/r1499130
Log:
* INSTALL: damn, I forgot to include in the rivet-2.1.2 the latest changes
to this file
Modified:
tcl/rivet/branches/2.1/ChangeLog
tcl/rivet/branches/2.1/INSTALL
tcl/rivet/branches/2.1/Makefile.in
Modified: tcl/rivet/branches/2.1/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/ChangeLog?rev=1499130&r1=1499129&r2=1499130&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/ChangeLog (original)
+++ tcl/rivet/branches/2.1/ChangeLog Tue Jul 2 22:02:45 2013
@@ -1,3 +1,7 @@
+2013-07-02 Massimo Manghi <mx...@apache.org>
+ * INSTALL: damn, I forgot to include in the rivet-2.1.2 the latest changes
+ to this file
+
2013-06-26 Massimo Manghi <mx...@apache.org>
* Makefile.am: forcing install/unistall targets to recreate pkgIndex.tcl
in order to have a coherent directory of packages actually available
Modified: tcl/rivet/branches/2.1/INSTALL
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/INSTALL?rev=1499130&r1=1499129&r2=1499130&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/INSTALL (original)
+++ tcl/rivet/branches/2.1/INSTALL Tue Jul 2 22:02:45 2013
@@ -1,5 +1,5 @@
- Rivet 2.1 Installation
- ======================
+ Rivet 2.1 Installation
+ ======================
For more detailed instructions, see the docs/html/ directory.
@@ -12,12 +12,12 @@ the source tree running 'aclocal; autore
Example:
-./configure --with-tcl=/usr/lib/tcl8.5/ \
- --with-apxs=/usr/bin/apxs \
- --with-tclsh=/usr/bin/tclsh8.5 \
- --with-apache-version=2 \
- --with-rivet-target-dir=/usr/lib/rivet2.1 \
- --enable-version-display
+./configure --with-tcl=/usr/lib/tcl8.5/ \
+ --with-apxs=/usr/bin/apxs \
+ --with-tclsh=/usr/bin/tclsh8.5 \
+ --with-apache-version=2 \
+ --with-rivet-target-dir=/usr/lib/rivet2.1 \
+ --enable-version-display
2) if 'configure' was successful Rivet is ready for compilation
@@ -27,9 +27,9 @@ make
sudo make install
-or simply
+4) Install Rivet utils with
-make install
+sudo make install-packages
if your configuration doesn't require you to have administrative privileges.
@@ -38,10 +38,10 @@ handles other specific options.
--with-tcl=DIR Directory where tclConfig.sh is
stored. This is a shell script that
- defines all the relevant symbols needed
- to build Tcl related applications.
+ defines all the relevant symbols needed
+ to build Tcl related applications.
--with-apache-version=VER Values are 1 or 2 depending
- on the apache server you're
+ on the apache server you're
builing the module for.
--with-apache=DIR Apache server's root directory.
--with-apxs=FILE Path to the apxs program to
@@ -50,7 +50,7 @@ handles other specific options.
--with-apache-include=DIR Apache's include files path.
--with-apr-config=FILE Apache Portable Runtime
metainformation program
---with-rivet-target-dir=DIR Rivet library installation directory.
+--with-rivet-target-dir=DIR Rivet library installation directory.
--enable-version-display Apache signature shows Rivet
version number in the form Rivet/2.0.x.
Default=no
@@ -58,7 +58,7 @@ handles other specific options.
These are the basic Apache configuration directives that are needed:
# Loads the module.
-LoadModule rivet_module /path/to/your/copy/of/mod_rivet.so
+LoadModule rivet_module /path/to/your/copy/of/mod_rivet.so
# Let the module handle .rvt and .tcl files.
AddType application/x-httpd-rivet rvt
@@ -72,9 +72,11 @@ If Apache1.x and Apache2.x coexist on th
tell configure where the right apxs (apache extension tool) script is
located. E.g.: on a Debian system apxs for Apache2.x is named apxs2
-./configure --with-apache-include=/usr/include/apr-1.0 \
- --with-apache-version=2 --with-apxs=/usr/bin/apxs2 \
- --with-tcl=/usr/lib/tcl8.6 --with-apache=/usr
+./configure --with-apache-include=/usr/include/apr-1.0 \
+ --with-apache-version=2 \
+ --with-apxs=/usr/bin/apxs2 \
+ --with-tcl=/usr/lib/tcl8.6 \
+ --with-apache=/usr
Here is another example reported by a user who successfully built
Rivet on Slackware 12.1
Modified: tcl/rivet/branches/2.1/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/Makefile.in?rev=1499130&r1=1499129&r2=1499130&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/Makefile.in (original)
+++ tcl/rivet/branches/2.1/Makefile.in Tue Jul 2 22:02:45 2013
@@ -18,7 +18,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1492454 2013-06-12 22:20:46Z mxmanghi $
+# $Id: Makefile.am 1496871 2013-06-26 10:17:34Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
@@ -69,8 +69,6 @@ DIST_COMMON = README $(am__configure_dep
tclconfig/ltmain.sh tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/tclconfig/tcl.m4 \
$(top_srcdir)/tclconfig/libtool.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
@@ -855,7 +853,8 @@ install-data-local:
$(mkinstalldirs) $(RIVETLIB_DESTDIR)
cp -v rivet/init.tcl $(RIVETLIB_DESTDIR)/
cp -rv rivet/rivet-tcl $(RIVETLIB_DESTDIR)/
- -( cd $(RIVETLIB_DESTDIR); rm -f *.la)
+ -( cd $(RIVETLIB_DESTDIR); rm -f *.la; \
+ echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
uninstall-local:
rm -f $(RIVETLIB_DESTDIR)/init.tcl
@@ -879,6 +878,8 @@ uninstall-packages:
@if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/*)' ]; then \
@rmdir $(RIVETLIB_DESTDIR); \
fi
+ -( cd $(RIVETLIB_DESTDIR); \
+ echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
#
distclean-local:
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org