fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2026-05-07 04:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'config' into 'master'

Browse source 
builds/freetype.mk: Shouldn't remove the user's config.mk

See merge request freetype/freetype!208
This commit is contained in:
Xiang Xiao 2026-04-13 14:21:16 +00:00
commit 67ec6a9b4a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builds/freetype.mk
View file

@ -363,7 +363,7 @@ distclean_project_dos: clean_project_dos
# Remove configuration file (used for distclean).
#
remove_config_mk:
-$(DELETE) $(subst /,$(SEP),$(CONFIG_MK) $(NO_OUTPUT))
-$(DELETE) $(subst /,$(SEP),$(TOP_DIR)/config.mk $(NO_OUTPUT))
# Remove module list (used for distclean).
#

2
builds/toplevel.mk
View file

@ -82,7 +82,7 @@ MODULES := $(FONT_MODULES) \
$(AUX_MODULES)
CONFIG_MK ?= config.mk
CONFIG_MK ?= $(TOP_DIR)/config.mk
# If no configuration sub-makefile is present, or if `setup' is the target
# to be built, run the auto-detection rules to figure out which