Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use "/usr/local" as default prefix for "make install" #448

Merged
merged 5 commits into from
Apr 10, 2019
Merged

Use "/usr/local" as default prefix for "make install" #448

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f351b86
Use "/usr/local" as default prefix for "make install"
ilammy Apr 2, 2019
71edd43
Keep backwards compatibility with source installations
ilammy Apr 4, 2019
b835b5d
Print out installation paths
ilammy Apr 8, 2019
f8d5d77
Revert "Keep backwards compatibility with source installations"
ilammy Apr 9, 2019
cb510ea
Warning about multiple Themis installations
ilammy Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,11 @@ define themisecho
@tput sgr0
endef

ifeq ($(ENGINE),)
ENGINE=libressl
endif

#default engine
ifeq ($(PREFIX),)
PREFIX = /usr
# default installation prefix
PREFIX ?= /usr/local

# MacOS
ifdef IS_MACOS
PREFIX = /usr/local
endif

endif
# default cryptographic engine
ENGINE ?= libressl

#engine selection block
ifneq ($(ENGINE),)
Expand Down Expand Up @@ -450,9 +441,29 @@ install_pkgconfig: err all make_install_dirs
@$(BUILD_CMD_)

install: install_soter_headers install_themis_headers install_static_libs install_shared_libs install_pkgconfig
@echo -n "Themis installed to $(PREFIX)"
@$(PRINT_OK_)
ifdef IS_LINUX
@ldconfig || (status=$$?; if [ $$(id -u) = "0" ]; then exit $$status; else exit 0; fi)
endif
@if [ -e /usr/include/themis/themis.h ] && [ -e /usr/local/include/themis/themis.h ]; then \
echo ""; \
echo "Multiple Themis installations detected in standard system paths:"; \
echo ""; \
echo " - /usr"; \
echo " - /usr/local"; \
echo ""; \
echo "This may lead to surprising behaviour when building and using software"; \
echo "which depends on Themis."; \
echo ""; \
echo "If you previously had Themis installed from source to \"/usr\","; \
echo "consider uninstalling the old version with"; \
echo ""; \
echo " sudo $(MAKE) uninstall PREFIX=/usr"; \
echo ""; \
echo "and keep the new version in \"/usr/local\"."; \
echo ""; \
fi

get_version:
@echo $(VERSION)
Expand Down Expand Up @@ -512,7 +523,7 @@ endif
uninstall: CMD = rm -rf $(PREFIX)/include/themis && rm -rf $(PREFIX)/include/soter && rm -f $(PREFIX)/lib/libsoter.a && rm -f $(PREFIX)/lib/libthemis.a && rm -f $(PREFIX)/lib/libsoter.$(SHARED_EXT) && rm -f $(PREFIX)/lib/libthemis.$(SHARED_EXT) && rm -f $(PREFIX)/lib/pkgconfig/libsoter.pc && rm -f $(PREFIX)/lib/pkgconfig/libthemis.pc

uninstall: phpthemis_uninstall rbthemis_uninstall themispp_uninstall jsthemis_uninstall
@echo -n "themis uninstall "
@echo -n "Themis uninstalled from $(PREFIX) "
@$(BUILD_CMD_)

ifeq ($(PHP_VERSION),5)
Expand Down Expand Up @@ -675,6 +686,8 @@ symlink_realname_to_soname:
strip:
@find . -name \*.$(SHARED_EXT)\.* -exec strip -o {} {} \;

deb: PREFIX = /usr

deb: soter_static themis_static soter_shared themis_shared soter_pkgconfig themis_pkgconfig collect_headers install_shell_scripts strip symlink_realname_to_soname
@mkdir -p $(BIN_PATH)/deb

Expand Down Expand Up @@ -717,6 +730,7 @@ deb: soter_static themis_static soter_shared themis_shared soter_pkgconfig themi
# it's just for printing .deb files
@find $(BIN_PATH) -name \*.deb

rpm: PREFIX = /usr

rpm: themis_static themis_shared themis_pkgconfig soter_static soter_shared soter_pkgconfig collect_headers install_shell_scripts strip symlink_realname_to_soname
@mkdir -p $(BIN_PATH)/rpm
Expand Down