1 diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensips-2.4.0/Makefile
2 --- opensips-2.4.0.orig/Makefile 2018-04-30 21:37:06.000000000 +0900
3 +++ opensips-2.4.0/Makefile 2018-05-23 19:45:30.853360012 +0900
5 # default debian version when running 'make deb'
6 DEBIAN_VERSION ?= jessie #TODO: can we determine this?
9 DEFS:= $(DEFS_EXTRA_OPTS)
13 # Install everything (except modules-docbook?)
14 install: install-app install-console install-modules-all
16 -opensipsmc: $(cfg_prefix)/$(cfg_dir) $(data_prefix)/$(data_dir)
17 +opensipsmc: $(cfg_dir) $(data_dir)
18 $(MAKE) -C menuconfig proper
19 $(MAKE) -C menuconfig \
20 MENUCONFIG_CFG_PATH=$(data_target)/menuconfig_templates/ \
25 -mk-install-dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \
26 - $(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \
27 - $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \
28 - $(data_prefix)/$(data_dir)
29 +mk-install-dirs: $(cfg_dir) $(bin_dir) \
30 + $(modules_dir) $(doc_dir) \
31 + $(man_dir)/man8 $(man_dir)/man5 \
35 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
36 -install-cfg: $(cfg_prefix)/$(cfg_dir)
37 +install-cfg: $(cfg_dir)
38 sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules_target)#g" \
39 < etc/$(NAME).cfg > $(cfg_prefix)/$(cfg_dir)$(NAME).cfg.sample0
40 umask 0077; sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg_target)tls/#g" \
42 $(cfg_prefix)/$(cfg_dir)/osipsconsolerc; \
45 -install-console: $(bin_prefix)/$(bin_dir)
46 +install-console: $(bin_dir)
47 # install osipsconsole
48 cat scripts/osipsconsole | \
49 sed -e "s#PATH_BIN[ \t]*=[ \t]*\"\./\"#PATH_BIN = \"$(bin-target)\"#g" | \
51 $(INSTALL_BIN) /tmp/osipsconsole $(bin_prefix)/$(bin_dir)
52 rm -fr /tmp/osipsconsole
54 -install-bin: $(bin_prefix)/$(bin_dir) opensipsmc utils
55 +install-bin: $(bin_dir) opensipsmc utils
56 # install opensips binary
57 $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
58 $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
60 cd utils/db_oracle; $(MAKE) all ; \
63 -install-modules: modules $(modules_prefix)/$(modules_dir)
64 +install-modules: modules $(modules_dir)
65 @for r in $(modules_full_path) "" ; do \
66 if [ -n "$$r" ]; then \
67 if [ -f "$$r" ]; then \
69 .PHONY: install-doc install-app-doc install-modules-doc
70 install-doc: install-app-doc install-modules-doc
72 -install-app-doc: $(doc_prefix)/$(doc_dir)
73 +install-app-doc: $(doc_dir)
74 -@for d in $(install_docs) ""; do \
75 if [ -n "$$d" ]; then \
76 $(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$d" ; \
81 -install-modules-doc: $(doc_prefix)/$(doc_dir)
82 +install-modules-doc: $(doc_dir)
83 -@for r in $(modules_basenames) "" ; do \
84 if [ -n "$$r" ]; then \
85 if [ -f modules/"$$r"/README ]; then \
90 -install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
91 +install-man: $(man_dir)/man8 $(man_dir)/man5
92 sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg_target)$(NAME).cfg#g" \
93 -e "s#/usr/sbin/#$(bin-target)#g" \
94 -e "s#/usr/lib/$(NAME)/modules/#$(modules_target)#g" \
96 $(man_prefix)/$(man_dir)/man8/opensipsunix.8
97 chmod 644 $(man_prefix)/$(man_dir)/man8/opensipsunix.8
99 -install-modules-docbook: $(doc_prefix)/$(doc_dir)
100 +install-modules-docbook: $(doc_dir)
101 -@for r in $(modules_basenames) "" ; do \
102 if [ -n "$$r" ]; then \
103 if [ -d modules/"$$r"/doc ]; then \
104 diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile.defs opensips-2.4.0/Makefile.defs
105 --- opensips-2.4.0.orig/Makefile.defs 2018-04-30 21:37:06.000000000 +0900
106 +++ opensips-2.4.0/Makefile.defs 2018-05-23 19:46:05.110927079 +0900
109 # check if already included/exported
111 -ifeq ($(makefile_defs), 1)
114 -export makefile_defs
119 @@ -1657,5 +1652,3 @@
120 test_objs := $(test_src:.c=.o)
121 objs := $(objs) $(test_objs)
124 -endif # ifeq ($(makefile_defs, 1)
125 diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile.rules opensips-2.4.0/Makefile.rules
126 --- opensips-2.4.0.orig/Makefile.rules 2018-04-30 21:37:06.000000000 +0900
127 +++ opensips-2.4.0/Makefile.rules 2018-05-23 19:46:45.491993230 +0900
129 END { print "#endif /* __MEM_STAT_H_ */\n#endif /* SHM_EXTRA_STATS */"; \
130 print "/* modules MD5: $(MODULES_MD5) */"; fflush()}' > $@
132 -$(cfg_prefix)/$(cfg_dir):
134 mkdir -m 700 -p $(cfg_prefix)/$(cfg_dir)
136 -$(bin_prefix)/$(bin_dir):
138 mkdir -p $(bin_prefix)/$(bin_dir)
140 -$(modules_prefix)/$(modules_dir):
142 mkdir -p $(modules_prefix)/$(modules_dir)
144 -$(doc_prefix)/$(doc_dir):
146 mkdir -p $(doc_prefix)/$(doc_dir)
148 -$(man_prefix)/$(man_dir)/man8:
150 mkdir -p $(man_prefix)/$(man_dir)/man8
152 -$(man_prefix)/$(man_dir)/man5:
154 mkdir -p $(man_prefix)/$(man_dir)/man5
156 -$(data_prefix)/$(data_dir):
158 mkdir -p $(data_prefix)/$(data_dir)