File adjust-layout-to-follow-FHS.patch of Package httpd24

Overview Repositories Revisions Requests Users Attributes Meta

File adjust-layout-to-follow-FHS.patch of Package httpd24

From: Michal Kubecek <mkubecek@suse.cz>
Date: Tue, 27 Apr 2021 17:02:34 +0200
Subject: adjust layout to follow FHS

None of existing layouts is fully compatible with FHS and openSUSE
packaging guidelines. Add and use a new one.
---
 Makefile.in          |  7 ++++---
 config.layout        | 25 +++++++++++++++++++++++++
 support/Makefile.in  |  7 ++++---
 support/apachectl.in |  4 ++--
 4 files changed, 35 insertions(+), 8 deletions(-)

--- a/Makefile.in
+++ b/Makefile.in
@@ -121,9 +121,10 @@ install-conf:
 	    done ; \
 	done ; \
 	if test -f "$(builddir)/envvars-std"; then \
-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+	    mkdir -p $(DESTDIR)$(sysconfdir)/support; \
+	    cp -p envvars-std $(DESTDIR)$(sysconfdir)/support; \
+	    if test ! -f $(DESTDIR)$(sysconfdir)/support/envvars; then \
+	        cp -p envvars-std $(DESTDIR)$(sysconfdir)/support/envvars ; \
 	    fi ; \
 	fi
 
--- a/config.layout
+++ b/config.layout
@@ -419,3 +419,28 @@
     proxycachedir:   ${localstatedir}/cache/apache2
 </Layout>
 
+# FHS compliant layout
+# See http://www.pathname.com/fhs/ for details
+<Layout FHS>
+    prefix:        /usr
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/sbin
+    libdir:        ${exec_prefix}/lib
+    libexecdir:    ${libdir}/httpd/modules
+    mandir:        ${prefix}/share/man
+    sysconfdir:    /etc/httpd
+    datadir:       ${prefix}/share
+    installbuilddir: ${datadir}/httpd/build
+    errordir:      ${datadir}/httpd/error
+    iconsdir:      ${datadir}/httpd/icons
+    htdocsdir:     /srv/http
+    manualdir:     ${datadir}/httpd/manual
+    cgidir:        ${libdir}/httpd/cgi-bin
+    includedir:    ${prefix}/include/httpd
+    localstatedir: /var
+    runtimedir:    ${localstatedir}/run/httpd
+    logfiledir:    ${localstatedir}/log/httpd
+    proxycachedir: ${localstatedir}/proxy
+</Layout>
+
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -30,9 +30,10 @@ install:
 	    fi ; \
 	done
 	@if test -f "$(builddir)/envvars-std"; then \
-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+	    mkdir -p $(DESTDIR)$(sysconfdir)/support; \
+	    cp -p envvars-std $(DESTDIR)$(sysconfdir)/support; \
+	    if test ! -f $(DESTDIR)$(sysconfdir)/support/envvars; then \
+	        cp -p envvars-std $(DESTDIR)$(sysconfdir)/support/envvars ; \
 	    fi ; \
 	fi
 
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -45,8 +45,8 @@ ARGV="$@"
 HTTPD='@exp_sbindir@/@progname@'
 #
 # pick up any necessary environment variables
-if test -f @exp_sbindir@/envvars; then
-  . @exp_sbindir@/envvars
+if test -f @exp_sysconfdir@/support/envvars; then
+  . @exp_sysconfdir@/support/envvars
 fi
 #
 # a command that outputs a formatted text version of the HTML at the

Places

File adjust-layout-to-follow-FHS.patch of Package httpd24

Places