Skip to content

Commit

Permalink
Merge pull request #78201 from andrewhr/fix-mac-build-after-doc-help-…
Browse files Browse the repository at this point in the history
…change

Fix macOS build after data/help folder removal
  • Loading branch information
Night-Pryanik authored Nov 29, 2024
2 parents 2975b6f + 18a384c commit 4ac3ac3
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 @@ -1122,7 +1122,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 @@ -1174,7 +1174,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 @@ -1209,7 +1208,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 @@ -1268,7 +1266,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 4ac3ac3

Please sign in to comment.