always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: Flatzinc fix

Browse Source
This commit is contained in:
Mizux Seiha
2022-03-15 19:29:30 +01:00
parent 14bfdbe3c4
commit c3fe9bf94b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/Makefile.archive.mk
View File

@@ -205,9 +205,9 @@ $(FZ_INSTALL_DIR)$(ARCHIVE_EXT): fz | $(TEMP_FZ_DIR)
-$(DELREC) $(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Sshare/eigen3
-$(DELREC) $(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Sshare/man
ifeq ($(PLATFORM),WIN64)
$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)flatzinc.$L* $(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Slib
$(COPY) "$(LIB_DIR)$S$(LIB_PREFIX)flatzinc.$L*" "$(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Slib"
else
$(COPY) $(LIB_DIR)*$S$(LIB_PREFIX)flatzinc.$L* $(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Slib
$(COPY) "$(LIB_DIR)*$S$(LIB_PREFIX)flatzinc*.$L*" "$(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Slib"
endif
$(COPY) $(BIN_DIR)$Sfz$E $(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Sbin$S$(FZ_EXE)
$(COPY) $(BIN_DIR)$Sparser_main$E $(TEMP_FZ_DIR)$S$(FZ_INSTALL_DIR)$Sbin$Sparser-or-tools$E

2
makefiles/Makefile.cpp.mk
View File

@@ -514,7 +514,7 @@ ifeq ($(PLATFORM),WIN64)
$(COPYREC) /E /Y share "$(DESTDIR)$(prefix)"
else
$(COPYREC) include "$(DESTDIR)$(prefix)$S"
$(COPY) $(LIB_DIR)*$S$(LIB_PREFIX)ortools*.$L* "$(DESTDIR)$(prefix)$Slib$S"
$(COPY) "$(LIB_DIR)*$S$(LIB_PREFIX)ortools*.$L*" "$(DESTDIR)$(prefix)$Slib$S"
$(COPYREC) share "$(DESTDIR)$(prefix)$S"
endif
$(COPY) bin$Sprotoc* "$(DESTDIR)$(prefix)$Sbin"