br...@apache.org wrote on Fri, Aug 17, 2012 at 16:58:22 -0000: > Author: brane > Date: Fri Aug 17 16:58:22 2012 > New Revision: 1374357 > > URL: http://svn.apache.org/viewvc?rev=1374357&view=rev > Log: > Followup to r1374198: Introduce a new build.conf predicate "when", which names > the post-configure substituted variable that controls the building and linking > of a module. Since the makefiles are generated before configure, "when" cannot > control the dependencies, but it can control the build/link commands. > > With this change, we can now put mod_dontdothat back into the tools group. > > Modified: subversion/trunk/build/generator/templates/makefile.ezt > URL: > http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/makefile.ezt?rev=1374357&r1=1374356&r2=1374357&view=diff > ============================================================================== > --- subversion/trunk/build/generator/templates/makefile.ezt (original) > +++ subversion/trunk/build/generator/templates/makefile.ezt Fri Aug 17 > 16:58:22 2012 > @@ -127,13 +127,13 @@ $([target.varname]_OBJECTS): $([target.v > ######################################## > [for areas] > [is areas.type "apache-mod"]install-mods-shared:[for areas.files] > [areas.files.fullname][end][for areas.files] > - cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; > $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end] > + [if-any areas.files.when]if $([areas.files.when]) ; then [else][end] > + cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; > $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename] > + [if-any areas.files.when] ; fi[else][end][end]
Should the line above be: + [end][if-any areas.files.when] ; fi[else][end] ? > [else]install-[areas.type]: [for areas.files][if-index areas.files > first][else] [end][areas.files.fullname][end] [for areas.apache_files] > [areas.apache_files.fullname][end] > $(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type > "locale"] > $(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] > + [if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd > [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] > [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any > areas.files.when] ; fi[else][end][else] > + [if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd > [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] > $(DESTDIR)[areas.files.install_fname][if-any areas.files.when] ; > fi[else][end][end][end][for areas.apache_files] > + [if-any areas.apache_files.when]if $([areas.apache_files.when]) ; then > [else][end]cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" > ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] > [areas.apache_files.filename][if-any areas.apache_files.when] ; > fi[else][end][end] I didn't check whether the same issue applies here. > [if-any areas.extra_install] $(INSTALL_EXTRA_[areas.uppervar]) > [end][end][end] >
