[packages/opensips] - up to 2.4.0, make.patch needs more massaging

baggins baggins at pld-linux.org
Wed May 23 09:47:13 CEST 2018 

commit 1385cae085dce2d989536de258c6ff3a0f1ddf07
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 23 16:46:40 2018 +0900

    - up to 2.4.0, make.patch needs more massaging

 make.patch    | 112 +++++++++++++++++++++++++-------------------------
 opensips.spec | 128 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 161 insertions(+), 79 deletions(-)
---
diff --git a/opensips.spec b/opensips.spec
index 9dfde22..743dba6 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without	mysql		# mysql support
 %bcond_without	pgsql		# PostgreSQL support
+%bcond_without	sqlite		# Sqlite3 support
 %bcond_without	odbc		# ODBC support
 %bcond_without	radius		# radius support
 %bcond_without	carrierroute	# carrierroute support
@@ -15,33 +16,34 @@
 %bcond_with	couchbase	# couchbase support
 %bcond_with	mongodb		# mongodb support
 %bcond_with	sngtc		# Sangoma transcoding module support
+%bcond_without	rabbitmq	# Rabbit MQ support
 
 Summary:	SIP proxy, redirect and registrar server
 Summary(pl.UTF-8):	Serwer SIP przekazujący (proxy), przekierowujący i rejestrujący
 Name:		opensips
-Version:	2.1.2
-Release:	6
+Version:	2.4.0
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	f7590fde5d99fffe05659442073d750c
+# Source0-md5:	0aafe11a30d9724784922667fb98b303
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.service
 Patch0:		x32.patch
 Patch1:		make.patch
 URL:		http://www.opensips.org/
-%{?with_sngtc:BuildRequires:    TODO-SNGTC-BRs}
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_osp:BuildRequires:	OSPToolkit}
+%{?with_sngtc:BuildRequires:    TODO-SNGTC-BRs}
 BuildRequires:	bison
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	flex
 %{?with_redis:BuildRequires:	hiredis-devel}
 %{?with_json:BuildRequires:	json-c-devel}
-%{?with_couchbase:BuildRequires:    libcouchbase-devel}
 %{?with_carrierroute:BuildRequires:	libconfuse-devel}
+%{?with_couchbase:BuildRequires:    libcouchbase-devel}
 %{?with_memcached:BuildRequires:	libmemcached-devel}
 %{?with_microhttpd:BuildRequires:	libmicrohttpd-devel}
 %{?with_mongodb:BuildRequires:	libmongo-client-devel}
@@ -49,6 +51,7 @@ BuildRequires:	flex
 BuildRequires:	libsctp-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-progs
+BuildRequires:	libuuid-devel
 #BuildRequires:	lynx
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	net-snmp-devel
@@ -57,9 +60,11 @@ BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	perl-devel
 BuildRequires:	perl-tools-devel
+%{?with_rabbitmq:BuildRequires:	rabbitmq-c-devel}
 %{?with_radius:BuildRequires:	radiusclient-ng-devel}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.671
+%{?with_sqlite:BuildRequires:	sqlite3-devel}
 #BuildRequires:	subversion
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 BuildRequires:	which
@@ -72,10 +77,9 @@ Suggests:	python-modules
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # mi_xmlrpc requires xmlrpc-c-devel in version 1.9 only
-# event_rabbitmq requires 'amqp.h'
 # cachedb_cassandra requires 'protocol/TBinaryProtocol.h'
 # lua: lua.h
-%define	exclude_modules	mi_xmlrpc db_oracle event_rabbitmq cachedb_cassandra lua
+%define	exclude_modules	mi_xmlrpc db_oracle cachedb_cassandra lua
 
 %description
 OpenSIPS (Open SIP Server) is a mature Open Source implementation of a
@@ -119,6 +123,18 @@ PostgreSQL module for openSIPS.
 %description postgres -l pl.UTF-8
 Moduł PostgreSQL do openSIPS.
 
+%package sqlite3
+Summary:	openSIPS Sqlite3 module
+Summary(pl.UTF-8):	Moduł Sqlite3 do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description sqlite3
+Sqlite3 module for openSIPS.
+
+%description sqlite3 -l pl.UTF-8
+Moduł Sqlite3 do openSIPS.
+
 %package json
 Summary:	openSIPS JSON module
 Summary(pl.UTF-8):	Moduł JSON do openSIPS
@@ -131,6 +147,18 @@ JSON module for openSIPS.
 %description json -l pl.UTF-8
 Moduł JSON do openSIPS.
 
+%package cgrates
+Summary:	openSIPS CGRateS module
+Summary(pl.UTF-8):	Moduł CGRateS do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description cgrates
+CGRateS module for openSIPS.
+
+%description cgrates -l pl.UTF-8
+Moduł CGRateS do openSIPS.
+
 %package memcached
 Summary:	openSIPS memcached module
 Summary(pl.UTF-8):	Moduł memcached do openSIPS
@@ -290,6 +318,18 @@ HTTP interface to openSIPS.
 %description httpd -l pl.UTF-8
 Interfejs HTTP do openSIPS.
 
+%package rabbitmq
+Summary:	RabbitMQ interface to openSIPS
+Summary(pl.UTF-8):	Interfejs RabbitMQ do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description rabbitmq
+RabbitMQ interface to openSIPS.
+
+%description rabbitmq -l pl.UTF-8
+Interfejs RabbitMQ do openSIPS.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -318,6 +358,9 @@ exclude_modules="$exclude_modules db_mysql"
 %if %{without pgsql}
 exclude_modules="$exclude_modules db_postgres"
 %endif
+%if %{without sqlite}
+exclude_modules="$exclude_modules db_sqlite"
+%endif
 %if %{without odbc}
 exclude_modules="$exclude_modules db_unixodbc"
 %endif
@@ -329,6 +372,7 @@ exclude_modules="$exclude_modules aaa_radius"
 %endif
 %if %{without json}
 exclude_modules="$exclude_modules json"
+exclude_modules="$exclude_modules cgrates"
 %endif
 %if %{without memcached}
 exclude_modules="$exclude_modules cachedb_memcached"
@@ -342,6 +386,9 @@ exclude_modules="$exclude_modules cachedb_mongodb"
 %if %{without sngtc}
 exclude_modules="$exclude_modules sngtc"
 %endif
+%if %{without rabbitmq}
+exclude_modules="$exclude_modules rabbitmq"
+%endif
 echo "$exclude_modules" > exclude_modules
 LDFLAGS="%{rpmldflags}" \
 %{__make} all \
@@ -389,9 +436,9 @@ done
 #rm -f seruser.sgml
 #cd ../..
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/opensips
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/opensips
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/opensips.service
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/opensips
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/opensips
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/opensips.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -452,9 +499,9 @@ fi
 # explict list here, no globs please (to avoid mistakes)
 %attr(755,root,root) %{_libdir}/opensips/modules/acc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/alias_db.so
-%attr(755,root,root) %{_libdir}/opensips/modules/auth.so
 %attr(755,root,root) %{_libdir}/opensips/modules/auth_aaa.so
 %attr(755,root,root) %{_libdir}/opensips/modules/auth_db.so
+%attr(755,root,root) %{_libdir}/opensips/modules/auth.so
 %attr(755,root,root) %{_libdir}/opensips/modules/avpops.so
 %attr(755,root,root) %{_libdir}/opensips/modules/b2b_entities.so
 %attr(755,root,root) %{_libdir}/opensips/modules/b2b_logic.so
@@ -464,9 +511,10 @@ fi
 %attr(755,root,root) %{_libdir}/opensips/modules/cachedb_sql.so
 %attr(755,root,root) %{_libdir}/opensips/modules/call_center.so
 %attr(755,root,root) %{_libdir}/opensips/modules/call_control.so
-%attr(755,root,root) %{_libdir}/opensips/modules/compression.so
 %attr(755,root,root) %{_libdir}/opensips/modules/cfgutils.so
-%attr(755,root,root) %{_libdir}/opensips/modules/cpl-c.so
+%attr(755,root,root) %{_libdir}/opensips/modules/clusterer.so
+%attr(755,root,root) %{_libdir}/opensips/modules/compression.so
+%attr(755,root,root) %{_libdir}/opensips/modules/cpl_c.so
 %attr(755,root,root) %{_libdir}/opensips/modules/db_berkeley.so
 %attr(755,root,root) %{_libdir}/opensips/modules/db_cachedb.so
 %attr(755,root,root) %{_libdir}/opensips/modules/db_flatstore.so
@@ -478,52 +526,62 @@ fi
 %attr(755,root,root) %{_libdir}/opensips/modules/dispatcher.so
 %attr(755,root,root) %{_libdir}/opensips/modules/diversion.so
 %attr(755,root,root) %{_libdir}/opensips/modules/dns_cache.so
-%attr(755,root,root) %{_libdir}/opensips/modules/domain.so
 %attr(755,root,root) %{_libdir}/opensips/modules/domainpolicy.so
+%attr(755,root,root) %{_libdir}/opensips/modules/domain.so
 %attr(755,root,root) %{_libdir}/opensips/modules/drouting.so
 %attr(755,root,root) %{_libdir}/opensips/modules/emergency.so
 %attr(755,root,root) %{_libdir}/opensips/modules/enum.so
 %attr(755,root,root) %{_libdir}/opensips/modules/event_datagram.so
+%attr(755,root,root) %{_libdir}/opensips/modules/event_flatstore.so
+%attr(755,root,root) %{_libdir}/opensips/modules/event_jsonrpc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/event_route.so
+%attr(755,root,root) %{_libdir}/opensips/modules/event_routing.so
+%attr(755,root,root) %{_libdir}/opensips/modules/event_virtual.so
 %attr(755,root,root) %{_libdir}/opensips/modules/event_xmlrpc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/exec.so
+%attr(755,root,root) %{_libdir}/opensips/modules/fraud_detection.so
+%attr(755,root,root) %{_libdir}/opensips/modules/freeswitch_scripting.so
+%attr(755,root,root) %{_libdir}/opensips/modules/freeswitch.so
 %attr(755,root,root) %{_libdir}/opensips/modules/gflags.so
 %attr(755,root,root) %{_libdir}/opensips/modules/group.so
-%attr(755,root,root) %{_libdir}/opensips/modules/fraud_detection.so
 %attr(755,root,root) %{_libdir}/opensips/modules/identity.so
 %attr(755,root,root) %{_libdir}/opensips/modules/imc.so
+%attr(755,root,root) %{_libdir}/opensips/modules/jsonrpc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/load_balancer.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mangler.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mathops.so
 %attr(755,root,root) %{_libdir}/opensips/modules/maxfwd.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mediaproxy.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mi_datagram.so
+%attr(755,root,root) %{_libdir}/opensips/modules/mid_registrar.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mi_fifo.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mi_json.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mi_xmlrpc_ng.so
 %attr(755,root,root) %{_libdir}/opensips/modules/msilo.so
-%attr(755,root,root) %{_libdir}/opensips/modules/nat_traversal.so
 %attr(755,root,root) %{_libdir}/opensips/modules/nathelper.so
+%attr(755,root,root) %{_libdir}/opensips/modules/nat_traversal.so
 %attr(755,root,root) %{_libdir}/opensips/modules/options.so
 %attr(755,root,root) %{_libdir}/opensips/modules/path.so
-%attr(755,root,root) %{_libdir}/opensips/modules/pdt.so
 %attr(755,root,root) %{_libdir}/opensips/modules/peering.so
 %attr(755,root,root) %{_libdir}/opensips/modules/permissions.so
-%attr(755,root,root) %{_libdir}/opensips/modules/pike.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pi_http.so
-%attr(755,root,root) %{_libdir}/opensips/modules/presence.so
+%attr(755,root,root) %{_libdir}/opensips/modules/pike.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_callinfo.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_dialoginfo.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_mwi.so
+%attr(755,root,root) %{_libdir}/opensips/modules/presence.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_xcapdiff.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_xml.so
+%attr(755,root,root) %{_libdir}/opensips/modules/proto_bin.so
+%attr(755,root,root) %{_libdir}/opensips/modules/proto_hep.so
 %attr(755,root,root) %{_libdir}/opensips/modules/proto_sctp.so
 %attr(755,root,root) %{_libdir}/opensips/modules/proto_tls.so
 %attr(755,root,root) %{_libdir}/opensips/modules/proto_ws.so
-%attr(755,root,root) %{_libdir}/opensips/modules/pua.so
+%attr(755,root,root) %{_libdir}/opensips/modules/proto_wss.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pua_bla.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pua_dialoginfo.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pua_mi.so
+%attr(755,root,root) %{_libdir}/opensips/modules/pua.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pua_usrloc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/python.so
 %attr(755,root,root) %{_libdir}/opensips/modules/qos.so
@@ -535,30 +593,35 @@ fi
 %attr(755,root,root) %{_libdir}/opensips/modules/rr.so
 %attr(755,root,root) %{_libdir}/opensips/modules/rtpengine.so
 %attr(755,root,root) %{_libdir}/opensips/modules/rtpproxy.so
-%attr(755,root,root) %{_libdir}/opensips/modules/seas.so
 %attr(755,root,root) %{_libdir}/opensips/modules/script_helper.so
+%attr(755,root,root) %{_libdir}/opensips/modules/seas.so
 %attr(755,root,root) %{_libdir}/opensips/modules/signaling.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sipcapture.so
+%attr(755,root,root) %{_libdir}/opensips/modules/sip_i.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sipmsgops.so
+%attr(755,root,root) %{_libdir}/opensips/modules/siprec.so
 %attr(755,root,root) %{_libdir}/opensips/modules/siptrace.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sl.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sms.so
 %attr(755,root,root) %{_libdir}/opensips/modules/speeddial.so
+%attr(755,root,root) %{_libdir}/opensips/modules/sql_cacher.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sst.so
 %attr(755,root,root) %{_libdir}/opensips/modules/statistics.so
 %attr(755,root,root) %{_libdir}/opensips/modules/stun.so
 %attr(755,root,root) %{_libdir}/opensips/modules/textops.so
+%attr(755,root,root) %{_libdir}/opensips/modules/tls_mgm.so
 %attr(755,root,root) %{_libdir}/opensips/modules/tm.so
 %attr(755,root,root) %{_libdir}/opensips/modules/topology_hiding.so
-%attr(755,root,root) %{_libdir}/opensips/modules/uac.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uac_auth.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uac_redirect.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uac_registrant.so
+%attr(755,root,root) %{_libdir}/opensips/modules/uac.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uri.so
 %attr(755,root,root) %{_libdir}/opensips/modules/userblacklist.so
 %attr(755,root,root) %{_libdir}/opensips/modules/usrloc.so
-%attr(755,root,root) %{_libdir}/opensips/modules/xcap.so
 %attr(755,root,root) %{_libdir}/opensips/modules/xcap_client.so
+%attr(755,root,root) %{_libdir}/opensips/modules/xcap.so
+%attr(755,root,root) %{_libdir}/opensips/modules/xml.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/db_berkeley
 %{_datadir}/%{name}/dbtext
@@ -586,12 +649,25 @@ fi
 %{_datadir}/%{name}/postgres
 %endif
 
+%if %{with sqlite}
+%files sqlite3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/db_sqlite.so
+%{_datadir}/opensips/sqlite
+%endif
+
 %if %{with json}
 %files json
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/opensips/modules/json.so
 %endif
 
+%if %{with json}
+%files cgrates
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/cgrates.so
+%endif
+
 %if %{with memcached}
 %files memcached
 %defattr(644,root,root,755)
@@ -662,3 +738,9 @@ fi
 %attr(755,root,root) %{_libdir}/opensips/modules/httpd.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mi_http.so
 %endif
+
+%if %{with rabbitmq}
+%files rabbitmq
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/rabbitmq.so
+%endif
diff --git a/make.patch b/make.patch
index 4e0dc87..43f64b4 100644
--- a/make.patch
+++ b/make.patch
@@ -13,8 +13,8 @@ diff -ur opensips-2.1.1/Makefile opensips-2.1.1.make/Makefile
  # Install everything (except modules-docbook?)
  install: install-app install-console install-modules-all
  
--opensipsmc: $(cfg-prefix)/$(cfg-dir) $(data-prefix)/$(data-dir)
-+opensipsmc: $(cfg-dir) $(data-dir)
+-opensipsmc: $(cfg_prefix)/$(cfg_dir) $(data_prefix)/$(data_dir)
++opensipsmc: $(cfg_dir) $(data_dir)
  	$(MAKE) -C menuconfig proper
  	$(MAKE) -C menuconfig \
  		MENUCONFIG_CFG_PATH=$(data-target)/menuconfig_templates/ \
@@ -22,46 +22,46 @@ diff -ur opensips-2.1.1/Makefile opensips-2.1.1.make/Makefile
  	$(MAKE) -C db/schema
  	- at echo "Done"
  
--mk-install-dirs: $(cfg-prefix)/$(cfg-dir) $(bin-prefix)/$(bin-dir) \
--			$(modules-prefix)/$(modules-dir) $(doc-prefix)/$(doc-dir) \
--			$(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5 \
--			$(data-prefix)/$(data-dir)
-+mk-install-dirs: $(cfg-dir) $(bin-dir) \
-+			$(modules-dir) $(doc-dir) \
-+			$(man-dir)/man8 $(man-dir)/man5 \
-+			$(data-dir)
+-mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \
+-			$(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \
+-			$(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \
+-			$(data_prefix)/$(data_dir)
++mk-install_dirs: $(cfg_dir) $(bin_dir) \
++			$(modules_dir) $(doc_dir) \
++			$(man_dir)/man8 $(man_dir)/man5 \
++			$(data_dir)
  
  		
  # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
--install-cfg: $(cfg-prefix)/$(cfg-dir)
-+install-cfg: $(cfg-dir)
+-install-cfg: $(cfg_prefix)/$(cfg_dir)
++install-cfg: $(cfg_dir)
  		sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \
- 			< etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
+ 			< etc/$(NAME).cfg > $(cfg_prefix)/$(cfg_dir)$(NAME).cfg.sample0
  		sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-target)tls/#g" \
 @@ -531,7 +530,7 @@
- 				$(cfg-prefix)/$(cfg-dir)/osipsconsolerc; \
+ 				$(cfg_prefix)/$(cfg_dir)/osipsconsolerc; \
  		fi
  
--install-console: $(bin-prefix)/$(bin-dir)
-+install-console: $(bin-dir)
+-install-console: $(bin_prefix)/$(bin_dir)
++install-console: $(bin_dir)
  		# install osipsconsole
  		cat scripts/osipsconsole | \
  		sed -e "s#PATH_BIN[ \t]*=[ \t]*\"\./\"#PATH_BIN = \"$(bin-target)\"#g" | \
 @@ -544,7 +543,7 @@
- 		$(INSTALL_BIN) /tmp/osipsconsole $(bin-prefix)/$(bin-dir)
+ 		$(INSTALL_BIN) /tmp/osipsconsole $(bin_prefix)/$(bin_dir)
  		rm -fr /tmp/osipsconsole
  
--install-bin: $(bin-prefix)/$(bin-dir) utils
-+install-bin: $(bin-dir) utils
+-install-bin: $(bin_prefix)/$(bin_dir) utils
++install-bin: $(bin_dir) utils
  		# install opensips binary
- 		$(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME) 
- 		$(INSTALL_BIN) $(NAME) $(bin-prefix)/$(bin-dir)
+ 		$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) 
+ 		$(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
 @@ -615,7 +614,8 @@
  			cd utils/db_oracle; $(MAKE) all ; \
  		fi ;
  
--install-modules: modules $(modules-prefix)/$(modules-dir)
-+install-modules: modules $(modules-dir)
+-install-modules: modules $(modules_prefix)/$(modules_dir)
++install-modules: modules $(modules_dir)
 +	echo $(modules_full_path)
  	@for r in $(modules_full_path) "" ; do \
  		if [ -n "$$r" ]; then \
@@ -70,16 +70,16 @@ diff -ur opensips-2.1.1/Makefile opensips-2.1.1.make/Makefile
  .PHONY: install-doc install-app-doc install-modules-doc
  install-doc: install-app-doc install-modules-doc
  
--install-app-doc: $(doc-prefix)/$(doc-dir)
-+install-app-doc: $(doc-dir)
+-install-app-doc: $(doc_prefix)/$(doc_dir)
++install-app-doc: $(doc_dir)
  	- at for d in $(install_docs) ""; do \
- 		$(INSTALL_TOUCH) $(doc-prefix)/$(doc-dir)/"$$d" ; \
- 		$(INSTALL_DOC) "$$d" $(doc-prefix)/$(doc-dir) ; \
+ 		$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$d" ; \
+ 		$(INSTALL_DOC) "$$d" $(doc_prefix)/$(doc_dir) ; \
  	done
  
  
--install-modules-doc: $(doc-prefix)/$(doc-dir)
-+install-modules-doc: $(doc-dir)
+-install-modules-doc: $(doc_prefix)/$(doc_dir)
++install-modules-doc: $(doc_dir)
  	- at for r in $(modules_basenames) "" ; do \
  		if [ -n "$$r" ]; then \
  			if [ -f modules/"$$r"/README ]; then \
@@ -87,17 +87,17 @@ diff -ur opensips-2.1.1/Makefile opensips-2.1.1.make/Makefile
  	done 
  
  
--install-man: $(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
-+install-man: $(man-dir)/man8 $(man-dir)/man5
+-install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
++install-man: $(man_dir)/man8 $(man_dir)/man5
  		sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg-target)$(NAME).cfg#g" \
  			-e "s#/usr/sbin/#$(bin-target)#g" \
  			-e "s#/usr/lib/$(NAME)/modules/#$(modules-target)#g" \
 @@ -679,7 +679,7 @@
- 			$(man-prefix)/$(man-dir)/man8/opensipsunix.8
- 		chmod 644  $(man-prefix)/$(man-dir)/man8/opensipsunix.8
+ 			$(man_prefix)/$(man_dir)/man8/opensipsunix.8
+ 		chmod 644  $(man_prefix)/$(man_dir)/man8/opensipsunix.8
  
--install-modules-docbook: $(doc-prefix)/$(doc-dir)
-+install-modules-docbook: $(doc-dir)
+-install-modules-docbook: $(doc_prefix)/$(doc_dir)
++install-modules-docbook: $(doc_dir)
  	- at for r in $(modules_basenames) "" ; do \
  		if [ -n "$$r" ]; then \
  			if [ -d modules/"$$r"/doc ]; then \
@@ -130,32 +130,32 @@ diff -ur opensips-2.1.1/Makefile.rules opensips-2.1.1.make/Makefile.rules
  		cp $< $@; \
  	fi
  
--$(cfg-prefix)/$(cfg-dir): 
-+$(cfg-dir): 
- 		mkdir -p $(cfg-prefix)/$(cfg-dir)
+-$(cfg_prefix)/$(cfg_dir): 
++$(cfg_dir): 
+ 		mkdir -p $(cfg_prefix)/$(cfg_dir)
  
--$(bin-prefix)/$(bin-dir):
-+$(bin-dir):
- 		mkdir -p $(bin-prefix)/$(bin-dir)
+-$(bin_prefix)/$(bin_dir):
++$(bin_dir):
+ 		mkdir -p $(bin_prefix)/$(bin_dir)
  
--$(modules-prefix)/$(modules-dir):
-+$(modules-dir):
- 		mkdir -p $(modules-prefix)/$(modules-dir)
+-$(modules_prefix)/$(modules_dir):
++$(modules_dir):
+ 		mkdir -p $(modules_prefix)/$(modules_dir)
  
--$(doc-prefix)/$(doc-dir):
-+$(doc-dir):
- 		mkdir -p $(doc-prefix)/$(doc-dir)
+-$(doc_prefix)/$(doc_dir):
++$(doc_dir):
+ 		mkdir -p $(doc_prefix)/$(doc_dir)
  
--$(man-prefix)/$(man-dir)/man8:
-+$(man-dir)/man8:
- 		mkdir -p $(man-prefix)/$(man-dir)/man8
+-$(man_prefix)/$(man_dir)/man8:
++$(man_dir)/man8:
+ 		mkdir -p $(man_prefix)/$(man_dir)/man8
  
--$(man-prefix)/$(man-dir)/man5:
-+$(man-dir)/man5:
- 		mkdir -p $(man-prefix)/$(man-dir)/man5
+-$(man_prefix)/$(man_dir)/man5:
++$(man_dir)/man5:
+ 		mkdir -p $(man_prefix)/$(man_dir)/man5
  
--$(data-prefix)/$(data-dir):
-+$(data-dir):
- 		mkdir -p $(data-prefix)/$(data-dir)
+-$(data_prefix)/$(data_dir):
++$(data_dir):
+ 		mkdir -p $(data_prefix)/$(data_dir)
  
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opensips.git/commitdiff/1385cae085dce2d989536de258c6ff3a0f1ddf07

More information about the pld-cvs-commit mailing list