From 9619c9d0518aa0b764cbc8fbefb68014ae992725 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Wed, 11 Oct 2006 21:25:28 +0000 Subject: [PATCH] FLAIM change. Corrected errors in the spec file. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@980 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/Makefile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/flaim/Makefile b/flaim/Makefile index 5a0c099..d0491da 100644 --- a/flaim/Makefile +++ b/flaim/Makefile @@ -1898,7 +1898,16 @@ endif uninstall: ifneq ($(host_os_family),win) $(ec)$(gprintf) "Uninstalling ...\n" - -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name)*$(shared_lib_suffix)* +ifneq ($(so_age),0) + -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision).$(so_age) + -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision) +else +ifneq ($(so_revision),0) + -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision) +endif + -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name).so.$(so_current) + -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name).so +endif -rm -rf $(lib_install_dir)/$(lib_prefix)$(project_name)$(static_lib_suffix) -rm -rf $(pkgconfig_install_dir)/$(pkgconfig_file_name) -rm -rf $(include_install_dir)/flaim.h @@ -1969,9 +1978,18 @@ spec: dircheck $(ec)$(gprintf) "$(percent)files\n" >> $(spec_file) $(ec)$(gprintf) "$(percent)defattr(-,root,root)\n" >> $(spec_file) $(ec)$(gprintf) "$(percent)doc COPYING COPYRIGHT VERSION\n" >> $(spec_file) - $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)$(asterisk)$(shared_lib_suffix)$(asterisk)\n" >> $(spec_file) +ifneq ($(so_age),0) + $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision).$(so_age)\n" >> $(spec_file) + $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision)\n" >> $(spec_file) +else +ifneq ($(so_revision),0) + $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision)\n" >> $(spec_file) +endif + $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name).so.$(so_current)\n" >> $(spec_file) +endif $(ec)$(gprintf) "\n" >> $(spec_file) $(ec)$(gprintf) "$(percent)files devel\n" >> $(spec_file) + $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name).so\n" >> $(spec_file) $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)$(static_lib_suffix)\n" >> $(spec_file) $(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/pkgconfig/$(pkgconfig_file_name)\n" >> $(spec_file) $(ec)$(gprintf) "$(percent){prefix}/include/flaim.h\n" >> $(spec_file)