diff options
| author | George Joseph <gjoseph@digium.com> | 2017-02-27 11:25:01 -0700 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-02-27 12:57:18 -0600 |
| commit | 4692a32ed7dccf3248383978741515a0e5b1ce85 (patch) | |
| tree | 10a1d6d9d681db156f340caa5cfcd62e1ba86e9b /main/Makefile | |
| parent | df22d297a64ee2ef53ea0296a353a5c90ae70ba2 (diff) | |
build: Warn if asterisk is installed in both 32 and 64 bit sys dirs
... and clean them both up on uninstall.
We've fixed the issue where 'make install' was installing to
/usr/lib on 64-bit systems that use /usr/lib64. Now we need
to clean up the remnants in /usr/lib.
* 'make install' now prints a warning if DESTDIR/ASTLIBDIR
contains 'lib64' and libasterisk* shared libraries or modules
are also found in DESTDIR/ASTLIBDIR with 'lib64' transformed
to 'lib'.
* 'make uninstall' ALWAYS cleans up both DESTDIR/ASTLIBDIR and
DESTDIR/ASTLIBDIR with 'lib64' transformed to 'lib'.
ASTERISK-26705
Change-Id: I6edddeb3c07a51e7c7ba7cac3c05e4bf3ec3f01f
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/main/Makefile b/main/Makefile index d3463f7b6..cf38f5f46 100644 --- a/main/Makefile +++ b/main/Makefile @@ -359,16 +359,8 @@ endif binuninstall: rm -f "$(DESTDIR)$(ASTSBINDIR)/$(MAIN_TGT)" rm -f "$(DESTDIR)$(ASTSBINDIR)/rasterisk" -ifneq ($(ASTSSL_LIB).$(ASTSSL_SO_VERSION),.) -# ASTSSL_SO_VERSION may not exist on Darwin - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" || : - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)" -endif -ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.) -# ASTSSL_SO_VERSION may not exist on Darwin - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)" || : - rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)" -endif + rm -f "$(DESTDIR)$(ASTLIBDIR)/libasterisk"* || : + rm -f "$(subst lib64,lib,$(DESTDIR)$(ASTLIBDIR))/libasterisk"* || : clean:: rm -f asterisk libasteriskssl.o |