From: Michael Tremer Date: Sun, 24 Mar 2024 10:10:07 +0000 (+0000) Subject: configure: Use Node SASS instead of SASSC X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1565a676318ac8d55d24b64957a5a1652b9bebe;p=ipfire.org.git configure: Use Node SASS instead of SASSC Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index b434e59b..6b4eed95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1168,11 +1168,11 @@ SED_PROCESS = \ %.css: %.sass Makefile $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SASSC) --style compressed $< > $@ + $(SASS) --style compressed $< > $@ src/sass/main.css: $(SASS_FILES) Makefile $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SASSC) --style compressed $< > $@ + $(SASS) --style compressed $< > $@ src/static/favicon.ico: src/static/img/ipfire-tux.png Makefile $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ diff --git a/configure.ac b/configure.ac index 17ef1294..fc99f7ca 100644 --- a/configure.ac +++ b/configure.ac @@ -47,9 +47,9 @@ AX_PYTHON_MODULE([tornado], [fatal]) AX_PYTHON_MODULE([zxcvbn], [fatal]) # sass -AC_CHECK_PROG(SASSC, [sassc], [sassc]) -if test -z "${SASSC}"; then - AC_MSG_ERROR([sassc is required]) +AC_CHECK_PROGS(SASS, [sass node-sass]) +if test -z "${SASS}"; then + AC_MSG_ERROR([sass is required]) fi # convert from ImageMagick