Commit ed2248f7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1836469, r1836154 from trunk: 

* config.layout: Allow configure --localstatedir to over-ride /var/www 
  location in Fedora layout.


* Makefile.in (install-suexec*): Fix make -jN install.

Submitted by: Arkadiusz Miskiewicz <arekm maven.pl>

Submitted by: jorton
Reviewed by: jorton, covener, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837645 13f79535-47bb-0310-9956-ffa450edef68
parent fcd0ca19

Makefile.in

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ install-man: 
	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \

	fi



install-suexec: install-suexec-binary install-suexec-$(INSTALL_SUEXEC)

install-suexec: install-suexec-$(INSTALL_SUEXEC)



install-suexec-binary:

	@if test -f $(builddir)/support/suexec; then \
@@ -277,12 +277,12 @@ install-suexec-binary: 
            $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \

	fi



install-suexec-setuid:

install-suexec-setuid: install-suexec-binary

	@if test -f $(builddir)/support/suexec; then \

	    chmod 4755 $(DESTDIR)$(sbindir)/suexec; \

	fi



install-suexec-caps:

install-suexec-caps: install-suexec-binary

	@if test -f $(builddir)/support/suexec; then \

            setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \

	fi

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -131,12 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     +1: jailletc36, ylavic (by inspection), covener

     jailletc36: untested, but looks straight forward enough to vote



   *) Build tweaks: fix make -j install, Fedora config.layout.

      trunk: http://svn.apache.org/r1836469

             http://svn.apache.org/r1836154

      2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk . 

      +1: jorton, covener, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

config.layout

+3 −3
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ 
# Layout used in Fedora httpd packaging.

<Layout Fedora>

    prefix:        /usr

    localstatedir: /var

    exec_prefix:   ${prefix}

    bindir:        ${prefix}/bin

    sbindir:       ${prefix}/sbin
@@ -144,11 +145,10 @@ 
    installbuilddir: ${libdir}/httpd/build

    errordir:      ${datadir}/error

    iconsdir:      ${datadir}/icons

    htdocsdir:     /var/www/html

    htdocsdir:     ${localstatedir}/www/html

    manualdir:     ${datadir}/manual

    cgidir:        /var/www/cgi-bin

    cgidir:        ${localstatedir}/www/cgi-bin

    includedir:    ${prefix}/include/httpd

    localstatedir: /var

    runtimedir:    /run/httpd

    logfiledir:    ${localstatedir}/log/httpd

    proxycachedir: ${localstatedir}/cache/httpd/proxy