diff options
| author | Jim Jagielski <jim@apache.org> | 2018-08-08 11:48:15 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2018-08-08 11:48:15 +0000 |
| commit | 3927579a4d341221bf7a577131f7bc1097eb8c5d (patch) | |
| tree | 82adfded1eda25897cc70f3e95c883c1964e8681 | |
| parent | 5323a97e5c2600506560af76de19f7182707c254 (diff) | |
| download | httpd-3927579a4d341221bf7a577131f7bc1097eb8c5d.tar.gz | |
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
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | STATUS | 6 | ||||
| -rw-r--r-- | config.layout | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index f667534fb1..21c76f884e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 @@ -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 ] diff --git a/config.layout b/config.layout index 76612db1f0..8579587297 100644 --- a/config.layout +++ b/config.layout @@ -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 |