Skip to content

Commit

Permalink
Fix macOS build after doc/help.json change
Browse files Browse the repository at this point in the history
After #78126 merge, there is no data/doc folder anymore, as help.json
become "a thing" so to speak.

This causes errors on macOS build, as part of dmg assembly we do need to
copy all folders, and mv (at least on macOS) is strict in relation to
the missing path.

The fix is essentially remove all mentions to old data/doc from
Makefile..
  • Loading branch information
andrewhr committed Nov 28, 2024
1 parent d16889e commit 18a384c
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ $(TEST_MO): data/mods/TEST_DATA/lang/po/ru.po

MO_DEPS := \
$(wildcard lang/*.sh lang/*.py src/*.cpp src/*.h) \
$(shell find data/raw data/json data/mods data/core data/help -type f -name '*.json')
$(shell find data/raw data/json data/mods data/core -type f -name '*.json')

lang/mo_built.stamp: $(MO_DEPS)
$(MAKE) -C lang
Expand Down Expand Up @@ -1175,7 +1175,6 @@ install: version $(TARGET)
cp -R --no-preserve=ownership data/motd $(DATA_PREFIX)
cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
cp -R --no-preserve=ownership data/title $(DATA_PREFIX)
cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
ifeq ($(TILES), 1)
cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
Expand Down Expand Up @@ -1210,7 +1209,6 @@ install: version $(TARGET)
cp -R --no-preserve=ownership data/motd $(DATA_PREFIX)
cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
cp -R --no-preserve=ownership data/title $(DATA_PREFIX)
cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
ifeq ($(TILES), 1)
cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
Expand Down Expand Up @@ -1269,7 +1267,6 @@ endif
cp -R data/motd $(APPDATADIR)
cp -R data/credits $(APPDATADIR)
cp -R data/title $(APPDATADIR)
cp -R data/help $(APPDATADIR)
ifdef LANGUAGES
$(MAKE) -C lang
mkdir -p $(APPRESOURCESDIR)/lang/mo/
Expand Down

0 comments on commit 18a384c

Please sign in to comment.