Skip to content

Commit eb52824

Browse files
NikokrockJicquel
authored andcommitted
Prefix "local-install" local build space with "gnatcoll"
Prevent conflicts with build spaces from other potential projects.
1 parent 848bc46 commit eb52824

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,18 @@ endif
9797
BUILD_ARGS=--jobs=$(PROCESSORS) \
9898
--build=$(BUILD) \
9999
--target=$(NORMALIZED_TARGET) \
100-
--prefix=local-install \
100+
--prefix=gnatcoll-core-install \
101101
--install \
102102
--enable-shared=$(ENABLE_SHARED)
103103

104104
build:
105-
rm -rf local-install
106-
mkdir -p local-install/share/gpr
107-
105+
rm -rf gnatcoll-core-install
106+
mkdir -p gnatcoll-core-install/share/gpr
107+
108108
ifeq ($(GNATCOLL_PROJECTS), yes)
109-
$(SED) -e 's/^-- with "gnatcoll_projects"/with "gnatcoll_projects"/g' $(GNATCOLL_GPR) > local-install/share/gpr/gnatcoll.gpr
109+
$(SED) -e 's/^-- with "gnatcoll_projects"/with "gnatcoll_projects"/g' $(GNATCOLL_GPR) > gnatcoll-core-install/share/gpr/gnatcoll.gpr
110110
else
111-
$(SED) -e 's/^with "gnatcoll_projects"/-- with "gnatcoll_projects"/g' $(GNATCOLL_GPR) > local-install/share/gpr/gnatcoll.gpr
111+
$(SED) -e 's/^with "gnatcoll_projects"/-- with "gnatcoll_projects"/g' $(GNATCOLL_GPR) > gnatcoll-core-install/share/gpr/gnatcoll.gpr
112112
endif
113113

114114
$(PYTHON) $(SOURCE_DIR)/minimal/gnatcoll_minimal.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS)
@@ -123,7 +123,7 @@ endif
123123

124124
install:
125125
@echo "Installing gnatcoll into $(prefix)"
126-
rsync -av ./local-install/ $(prefix)$(integrated_install)
126+
rsync -av ./gnatcoll-core-install/ $(prefix)$(integrated_install)
127127

128128
# Documentation
129129
doc:
@@ -137,7 +137,7 @@ doc:
137137
###########
138138

139139
clean:
140-
rm -rf local-install
140+
rm -rf gnatcoll-core-install
141141

142142
# Let gprbuild handle parallelisation. In general, we don't support parallel
143143
# runs in this Makefile, as concurrent gprinstall processes may crash.

0 commit comments

Comments
 (0)