From 89487da188f1adb0960f4fe9d07dc1d74adc7b01 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 9 Mar 2023 22:37:07 +0100 Subject: [PATCH] nhttpd: move yWeb.conf into y-web dir Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/50f55f1b9deedfdc45241d4a6aecf2d130418f3e Author: vanhofen Date: 2023-03-09 (Thu, 09 Mar 2023) Origin message was: ------------------ - nhttpd: move yWeb.conf into y-web dir ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Makefile.am | 3 +++ {src/nhttpd => data/y-web}/yWeb.conf | 0 src/nhttpd/Makefile.am | 4 ---- 3 files changed, 3 insertions(+), 4 deletions(-) rename {src/nhttpd => data/y-web}/yWeb.conf (100%) diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 20b519e82..e2aba5972 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -94,6 +94,9 @@ install_DATA = \ Y_Wait.yhtm \ Y_yWeb.js +configdir = $(CONFIGDIR) +config_DATA = yWeb.conf + install-data-hook: @# Badass hack, I know. If anyone knows a better way -- please send patch! find $(DESTDIR)$(PRIVATE_HTTPDDIR)/ -type f -print0 | xargs --no-run-if-empty -0 \ diff --git a/src/nhttpd/yWeb.conf b/data/y-web/yWeb.conf similarity index 100% rename from src/nhttpd/yWeb.conf rename to data/y-web/yWeb.conf diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am index 69b5b6f01..2177f759c 100644 --- a/src/nhttpd/Makefile.am +++ b/src/nhttpd/Makefile.am @@ -18,13 +18,9 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/connection \ @FREETYPE_CFLAGS@ - noinst_LIBRARIES = libnhttpd.a libnhttpd_a_SOURCES = yhttpd.cpp libnhttpd_adir = @CONFIGDIR@ libnhttpd_a_DATA = nhttpd.conf EXTRA_DIST = nhttpd.conf nhttpd.conf.in - -installdir = $(CONFIGDIR) -install_DATA = yWeb.conf