subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1307184 - in /subversion/trunk: Makefile.in build/generator/templates/makefile.ezt
Date Fri, 30 Mar 2012 00:52:40 GMT
Author: danielsh
Date: Fri Mar 30 00:52:40 2012
New Revision: 1307184

URL: http://svn.apache.org/viewvc?rev=1307184&view=rev
Log:
Make mod_dontdothat install in $(APACHE_LIBEXECDIR)/svn-tools/,
rather than in $(APACHE_LIBEXECDIR).

* Makefile.in
  (APACHE_LIBEXECDIR_TOOLS, INSTALL_MOD_SHARED_TOOLS): New macros.

* build/generator/templates/makefile.ezt
  (Section #7: install-tools): Use them for installing apache-mod's in tools.

Modified:
    subversion/trunk/Makefile.in
    subversion/trunk/build/generator/templates/makefile.ezt

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1307184&r1=1307183&r2=1307184&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Mar 30 00:52:40 2012
@@ -135,6 +135,7 @@ INCLUDES = -I$(top_srcdir)/subversion/in
 
 APACHE_INCLUDES = @APACHE_INCLUDES@
 APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
+APACHE_LIBEXECDIR_TOOLS = $(DESTDIR)@APACHE_LIBEXECDIR@/svn-tools
 APACHE_LDFLAGS = @APACHE_LDFLAGS@
 
 SWIG = @SWIG@
@@ -252,6 +253,7 @@ INSTALL_CONTRIB = $(LIBTOOL) --mode=inst
 INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
 INSTALL_INCLUDE = $(INSTALL) -m 644
 INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
+INSTALL_MOD_SHARED_TOOLS = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR_TOOLS)"
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_LOCALE = $(INSTALL_DATA)
 

Modified: subversion/trunk/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/makefile.ezt?rev=1307184&r1=1307183&r2=1307184&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/makefile.ezt (original)
+++ subversion/trunk/build/generator/templates/makefile.ezt Fri Mar 30 00:52:40 2012
@@ -131,7 +131,7 @@ $([target.varname]_OBJECTS): $([target.v
 	$(MKDIR) [areas.files.installdir]
 	cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
 	cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for
areas.apache_files]
-	cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED)
-n [areas.apache_files.name] [areas.apache_files.filename][end]
+	cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR_TOOLS)" ; $(INSTALL_MOD_SHARED_TOOLS)
-n [areas.apache_files.name] [areas.apache_files.filename][end]
 [if-any areas.extra_install]	$(INSTALL_EXTRA_[areas.uppervar])
 [end][end][end]
 



Mime
View raw message