Module: sip-router Branch: master Commit: b87c9b03499e58d481cf6fe02302a378051272a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b87c9b03...
Author: Carsten Bock carsten@ng-voice.com Committer: Carsten Bock carsten@ng-voice.com Date: Mon Jan 14 17:46:08 2013 +0100
b/f: Do not remove lib*, only "real" libs
---
pkg/kamailio/deb/debian/rules | 12 ++++++++---- pkg/kamailio/deb/lenny/rules | 12 ++++++++---- pkg/kamailio/deb/lucid/rules | 12 ++++++++---- pkg/kamailio/deb/precise/rules | 12 ++++++++---- pkg/kamailio/deb/squeeze/rules | 12 ++++++++---- pkg/kamailio/deb/wheezy/rules | 12 ++++++++---- 6 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 7c7d4f6..b2a185c 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index c4edd6e..bb146e4 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index 39a48ae..d042a5c 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index 9e8ac28..f809800 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 5b8dda0..9961948 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 4bbf814..149d34c 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ - echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done )
-
admin＠sip-router.org