--- a/Makefile.am	Wed Jan 24 20:18:59 2024 -0500
+++ b/Makefile.am	Sun Feb 04 21:17:17 2024 -0500
@@ -5,23 +5,23 @@
 	rc/locale/es.ts
 
 .ts.qm:
-	@MKDIR_P@ `dirname $@`; \
-	@QT_LRELEASE@ $< -qm $@
+	$(MKDIR_P) `dirname $@`; \
+	$(LRELEASE) $< -qm $@
 
 minori_locale_qm = $(minori_locale_ts:.ts=.qm)
 
 # this has to be in the root build folder
-translations.qrc: $(minori_locale_qm)
+rc/locale/translations.qrc: $(minori_locale_qm)
 	printf "<!DOCTYPE rcc><RCC version=\"1.0\">\n\t<qresource prefix=\"locale/\">\n" > $@; \
 	for q in $(minori_locale_qm); do \
-		printf "\t\t<file alias=\"%s\">%s</file>\n" "`basename $$q`" "$$q" >> $@; \
-	done; \
+		printf "\t\t<file>%s</file>\n" "`basename $$q`" >> $@; \
+	done;
 	printf "\t</qresource>\n</RCC>\n" >> $@;
 
 minori_qtrc = \
 	$(top_srcdir)/rc/icons/icons.qrc	\
 	$(top_srcdir)/rc/player_data.qrc	\
-	translations.qrc
+	rc/locale/translations.qrc
 
 if BUILD_WIN
 
@@ -30,7 +30,7 @@
 endif
 
 rc/final_qrc.cc: $(minori_qtrc)
-	@QT_RCC@ -o $@ $(minori_qtrc)
+	$(RCC) -o $@ $(minori_qtrc)
 
 minori_qtheaders = \
 	include/core/http.h			\
@@ -84,8 +84,8 @@
 
 if BUILD_GLIB
 files_glib = src/sys/glib/dark_theme.cc
-cflags_glib = @GIO_CFLAGS@
-libs_glib = @GIO_LIBS@
+cflags_glib = $(GLIB_CFLAGS)
+libs_glib = $(GLIB_LIBS)
 endif
 
 if BUILD_WIN
@@ -101,8 +101,9 @@
 .rc.$(OBJEXT):
 	$(WINDRES) $(WRCFLAGS) -i $< -o $@
 files_windres=rc/win32/version.rc rc/win32/resource.rc
-endif
-endif
+endif # BUILD_WINDRES
+
+endif # BUILD_WIN
 
 if BUILD_OSX
 files_osx = src/sys/osx/dark_theme.cc src/sys/osx/filesystem.cc src/sys/osx/permissions.cc
@@ -156,9 +157,11 @@
 	$(files_osx)			\
 	$(files_glib)			\
 	$(files_win)			\
+	$(files_windres)
+
+nodist_minori_SOURCES = \
 	$(minori_moc_sources)	\
-	rc/final_qrc.cc		\
-	$(files_windres)
+	rc/final_qrc.cc
 
 minori_includes = \
 	-I$(top_srcdir)/include \
@@ -167,16 +170,16 @@
 	-I$(top_srcdir)/dep/anitomy \
 	-I$(top_srcdir)/dep
 
-minori_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(minori_includes)
-minori_CXXFLAGS = @QT_CXXFLAGS@ $(cflags_osx) $(cflags_glib) $(cflags_win) -std=c++17
-minori_LDFLAGS = $(ldflags_osx) $(ldflags_win)
+minori_CPPFLAGS = $(QT_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(minori_includes)
+minori_CXXFLAGS = $(cflags_osx) $(cflags_glib) $(cflags_win)
+minori_LDFLAGS = $(QT_LDFLAGS) $(ldflags_osx) $(ldflags_win)
 
 minori_DEPENDENCIES = dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la
-minori_LDADD = $(libs_glib) $(libs_osx) $(libs_win) @LIBCURL@ @QT_LIBS@ dep/pugixml/libpugixml.la dep/animia/libanimia.la dep/anitomy/libanitomy.la
+minori_LDADD = $(libs_glib) $(LIBCURL) $(QT_LIBS) $(libs_osx) $(libs_win) $(minori_DEPENDENCIES)
 
 .h_moc.cc:
-	@MKDIR_P@ -- `dirname $@`
-	@QT_MOC@ -o $@ $(minori_includes) $<
+	$(MKDIR_P) -- `dirname $@`
+	$(MOC) -o $@ $(minori_includes) $<
 
 SUFFIXES = .h _moc.cc .ts .qm
 SUBDIRS = $(subdirs)