63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
From: Egbert Eich <eich@suse.com>
|
|
Date: Sun Dec 14 13:41:18 2025 +0100
|
|
Subject: Fix web skin path location
|
|
Patch-mainline: Not yet
|
|
Git-repo: https://git.code.sf.net/p/sispmctl/git
|
|
Git-commit: f12a0322d11675ffc00a9e90d8d9db7d733ae5fc
|
|
References:
|
|
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
Signed-off-by: Egbert Eich <eich@suse.de>
|
|
---
|
|
configure.ac | 4 ++--
|
|
src/Makefile.am | 12 ++++++------
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 381ad88..7482b7b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -35,10 +35,10 @@ AM_CONDITIONAL(ALLSTATICCOND, test x$ALLSTATIC = xtrue)
|
|
AC_CONFIG_HEADERS(config.h)
|
|
|
|
AC_ARG_WITH([webdir],
|
|
- AS_HELP_STRING([--with-skin],
|
|
+ AS_HELP_STRING([--with-webdir],
|
|
[directory with skin files for the web-interface]),
|
|
[WEBDIR="$withval"],
|
|
- [WEBDIR="$docdir/skin"])
|
|
+ [WEBDIR="$docdir"])
|
|
AC_SUBST(WEBDIR)
|
|
|
|
AC_ARG_WITH(bindaddr,
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index e130738..b1d8c7b 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -25,11 +25,11 @@ EXTRA_DIST = \
|
|
if WEBLESSCOND
|
|
AM_CFLAGS=-Wall -DWEBLESS=@WEBLESS@
|
|
else
|
|
-AM_CFLAGS=-Wall -DBINDADDR="\"@BINDADDR@\"" -DDATADIR="\"@WEBDIR@\""
|
|
+AM_CFLAGS=-Wall -DBINDADDR="\"@BINDADDR@\"" -DDATADIR="\"@WEBDIR@/skin\""
|
|
|
|
-pkgdata1dir = "$(docdir)/httpd/skin1"
|
|
-pkgdata2dir = "$(docdir)/httpd/skin2"
|
|
-pkgdata3dir = "$(docdir)/httpd/skin3"
|
|
+pkgdata1dir = "@WEBDIR@/httpd/skin1"
|
|
+pkgdata2dir = "@WEBDIR@/httpd/skin2"
|
|
+pkgdata3dir = "@WEBDIR@/httpd/skin3"
|
|
|
|
pkgdata1_DATA = \
|
|
web1/index.html web1/logo.png web1/off1.html web1/off2.html \
|
|
@@ -58,8 +58,8 @@ AM_LDFLAGS = $(all_libraries)
|
|
install-data-local:
|
|
if WEBLESSCOND
|
|
else
|
|
- mkdir -p "$(DESTDIR)$(docdir)/httpd/skin1"
|
|
- cd "$(DESTDIR)$(docdir)" && ln -sf httpd/skin2 skin
|
|
+ mkdir -p "$(DESTDIR)@WEBDIR@/httpd/skin1"
|
|
+ cd "$(DESTDIR)@WEBDIR@" && ln -sf httpd/skin2 skin
|
|
endif
|
|
|
|
uninstall-local:
|