remove broken support for /opt prefix

Thu, 13 Nov 2025 18:46:08 +0100

author
Mike Becker <universe@uap-core.de>
date
Thu, 13 Nov 2025 18:46:08 +0100
changeset 161
3d1cd23f88f7
parent 160
3644d06f60d4
child 162
79eeb33c738f

remove broken support for /opt prefix

src/main/resources/make/configure.vm file | annotate | diff | comparison | revisions
test/configure file | annotate | diff | comparison | revisions
test/configure2 file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions
--- a/src/main/resources/make/configure.vm	Thu Nov 13 18:30:51 2025 +0100
+++ b/src/main/resources/make/configure.vm	Thu Nov 13 18:46:08 2025 +0100
@@ -241,8 +241,6 @@
 if [ -z "$sysconfdir" ]; then
     if [ "$prefix" = '/usr' ]; then
         sysconfdir='/etc'
-    elif [ "$prefix" = '/opt' ]; then
-        sysconfdir='/etc/opt'
     else
         sysconfdir='${prefix}/etc'
     fi
@@ -250,8 +248,6 @@
 if [ -z "$localstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         localstatedir='/var'
-    elif [ "$prefix" = '/opt' ]; then
-        localstatedir='/var/opt'
     else
         localstatedir='${prefix}/var'
     fi
@@ -259,8 +255,6 @@
 if [ -z "$runstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         runstatedir='/var/run'
-    elif [ "$prefix" = '/opt' ]; then
-        runstatedir='/var/run/opt'
     else
         runstatedir='${prefix}/var'
     fi
--- a/test/configure	Thu Nov 13 18:30:51 2025 +0100
+++ b/test/configure	Thu Nov 13 18:46:08 2025 +0100
@@ -214,8 +214,6 @@
 if [ -z "$sysconfdir" ]; then
     if [ "$prefix" = '/usr' ]; then
         sysconfdir='/etc'
-    elif [ "$prefix" = '/opt' ]; then
-        sysconfdir='/etc/opt'
     else
         sysconfdir='${prefix}/etc'
     fi
@@ -223,8 +221,6 @@
 if [ -z "$localstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         localstatedir='/var'
-    elif [ "$prefix" = '/opt' ]; then
-        localstatedir='/var/opt'
     else
         localstatedir='${prefix}/var'
     fi
@@ -232,8 +228,6 @@
 if [ -z "$runstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         runstatedir='/var/run'
-    elif [ "$prefix" = '/opt' ]; then
-        runstatedir='/var/run/opt'
     else
         runstatedir='${prefix}/var'
     fi
--- a/test/configure2	Thu Nov 13 18:30:51 2025 +0100
+++ b/test/configure2	Thu Nov 13 18:46:08 2025 +0100
@@ -212,8 +212,6 @@
 if [ -z "$sysconfdir" ]; then
     if [ "$prefix" = '/usr' ]; then
         sysconfdir='/etc'
-    elif [ "$prefix" = '/opt' ]; then
-        sysconfdir='/etc/opt'
     else
         sysconfdir='${prefix}/etc'
     fi
@@ -221,8 +219,6 @@
 if [ -z "$localstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         localstatedir='/var'
-    elif [ "$prefix" = '/opt' ]; then
-        localstatedir='/var/opt'
     else
         localstatedir='${prefix}/var'
     fi
@@ -230,8 +226,6 @@
 if [ -z "$runstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         runstatedir='/var/run'
-    elif [ "$prefix" = '/opt' ]; then
-        runstatedir='/var/run/opt'
     else
         runstatedir='${prefix}/var'
     fi
--- a/test/make/configure.vm	Thu Nov 13 18:30:51 2025 +0100
+++ b/test/make/configure.vm	Thu Nov 13 18:46:08 2025 +0100
@@ -241,8 +241,6 @@
 if [ -z "$sysconfdir" ]; then
     if [ "$prefix" = '/usr' ]; then
         sysconfdir='/etc'
-    elif [ "$prefix" = '/opt' ]; then
-        sysconfdir='/etc/opt'
     else
         sysconfdir='${prefix}/etc'
     fi
@@ -250,8 +248,6 @@
 if [ -z "$localstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         localstatedir='/var'
-    elif [ "$prefix" = '/opt' ]; then
-        localstatedir='/var/opt'
     else
         localstatedir='${prefix}/var'
     fi
@@ -259,8 +255,6 @@
 if [ -z "$runstatedir" ]; then
     if [ "$prefix" = '/usr' ]; then
         runstatedir='/var/run'
-    elif [ "$prefix" = '/opt' ]; then
-        runstatedir='/var/run/opt'
     else
         runstatedir='${prefix}/var'
     fi

mercurial