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 2017/01/17 09:16:29 UTC
svn commit: r1779155 - in /tcl/rivet/trunk: ChangeLog Makefile.am
Makefile.in src/Makefile.am
Author: mxmanghi
Date: Tue Jan 17 09:16:29 2017
New Revision: 1779155
URL: http://svn.apache.org/viewvc?rev=1779155&view=rev
Log:
* Makefile.am: removing the mpm shared library
directory only if exists (it's removed by
the libtool generated rules by the src/Makefile.am)
* src/Makefile.am: installation directories
have been prepended by DESTDIR
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.am
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/src/Makefile.am
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1779155&r1=1779154&r2=1779155&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Jan 17 09:16:29 2017
@@ -1,3 +1,10 @@
+2017-01-17 Massimo Manghi <mx...@apache.org>
+ * Makefile.am: removing the mpm shared library
+ directory only if exists (it's removed by
+ the libtool generated rules by the src/Makefile.am)
+ * src/Makefile.am: installation directories
+ have been prepended by DESTDIR
+
2017-01-16 Massimo Manghi <mx...@apache.org>
* Makefile.am: removing the _configs.sed file generated
by configure in distclean target rule fulfills now
@@ -155,9 +162,9 @@
* src/mod_rivet/mod_rivet_common.c: the request_rec
field to be checked in order to determine whether we
are serving the request is 'header' non 'content_type'.
- This bug didn't surface because their set to the same
- string when a request is handed to the module chain, but
- it's been around ever since.
+ This bug didn't surface because it's set to the same
+ string when a request is handed down to the module
+ chain, but it's been around ever since.
2016-11-08 Massimo Manghi <mx...@apache.org>
* src/mod_rivet_ng/apache_config.c: fixed conf
Modified: tcl/rivet/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.am?rev=1779155&r1=1779154&r2=1779155&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.am (original)
+++ tcl/rivet/trunk/Makefile.am Tue Jan 17 09:16:29 2017
@@ -43,11 +43,15 @@ uninstall-local:
rm -f $(RIVETLIB_DESTDIR)/librivetparser.so
rm -fr $(RIVETLIB_DESTDIR)/packages
rm -f $(RIVETLIB_DESTDIR)/pkgIndex.tcl
- @if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/mpm/*)' ]; then \
- rmdir $(RIVETLIB_DESTDIR)/mpm; \
+ @if [ -e $(RIVETLIB_DESTDIR)/mpm/ ] && [ -d $(RIVETLIB_DESTDIR)/mpm/ ]; then \
+ rm -fr $(RIVETLIB_DESTDIR)/mpm ; \
+ else \
+ echo "Directory $(RIVETLIB_DESTDIR)/mpm not existing"; \
fi
- @if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/*)' ]; then \
+ @if [ -e $(RIVETLIB_DESTDIR) ] && [ -d $(RIVETLIB_DESTDIR) ]; then \
rmdir $(RIVETLIB_DESTDIR); \
+ else \
+ echo "Directory $(RIVETLIB_DESTDIR) not existing"; \
fi
install-packages:
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1779155&r1=1779154&r2=1779155&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Tue Jan 17 09:16:29 2017
@@ -17,7 +17,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1777395 2017-01-05 01:16:33Z mxmanghi $
+# $Id: Makefile.am 1779042 2017-01-16 15:29:36Z 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
@@ -942,11 +942,15 @@ uninstall-local:
rm -f $(RIVETLIB_DESTDIR)/librivetparser.so
rm -fr $(RIVETLIB_DESTDIR)/packages
rm -f $(RIVETLIB_DESTDIR)/pkgIndex.tcl
- @if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/mpm/*)' ]; then \
- rmdir $(RIVETLIB_DESTDIR)/mpm; \
+ @if [ -e $(RIVETLIB_DESTDIR)/mpm/ ] && [ -d $(RIVETLIB_DESTDIR)/mpm/ ]; then \
+ rm -fr $(RIVETLIB_DESTDIR)/mpm ; \
+ else \
+ echo "Directory $(RIVETLIB_DESTDIR)/mpm not existing"; \
fi
- @if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/*)' ]; then \
+ @if [ -e $(RIVETLIB_DESTDIR) ] && [ -d $(RIVETLIB_DESTDIR) ]; then \
rmdir $(RIVETLIB_DESTDIR); \
+ else \
+ echo "Directory $(RIVETLIB_DESTDIR) not existing"; \
fi
install-packages:
Modified: tcl/rivet/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/Makefile.am?rev=1779155&r1=1779154&r2=1779155&view=diff
==============================================================================
--- tcl/rivet/trunk/src/Makefile.am (original)
+++ tcl/rivet/trunk/src/Makefile.am Tue Jan 17 09:16:29 2017
@@ -16,7 +16,7 @@
#SUBDIRS = @rivet_core@
-lib_libexecdir = @RIVET_TCL_TARGET@
+lib_libexecdir = $(DESTDIR)@RIVET_TCL_TARGET@
lib_libexec_LTLIBRARIES = librivetparser.la librivetlib.la
#
@@ -68,7 +68,7 @@ mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @A
mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
mod_rivet_la_CPPFLAGS = -I$(srcdir) -I$(srcdir)/@rivet_core@ -I$(srcdir)/@rivet_channel@ -I$(srcdir)/parser -I$(srcdir)/@apache_request@ @apache_include@ -I. @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ @APU_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
-lib_libmpmdir = @RIVET_TCL_TARGET@/mpm
+lib_libmpmdir = $(DESTDIR)@RIVET_TCL_TARGET@/mpm
lib_libmpm_LTLIBRARIES = rivet_worker_mpm.la rivet_prefork_mpm.la rivet_lazy_mpm.la
rivet_worker_mpm_la_SOURCES = @rivet_core@/rivet_worker_mpm.c @rivet_core@/worker_prefork_common.c
@@ -99,4 +99,4 @@ uninstall:
rm -f $(DESTDIR)$(lib_libmpmdir)/*.so
rm -f $(DESTDIR)$(lib_libexecdir)/*.so
rm -f $(DESTDIR)$(apxs_libexecdir)/mod_rivet.so
-
+
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org