1 --- opensips-2.4.8/Makefile.orig 2020-06-15 17:14:49.000000000 +0200
2 +++ opensips-2.4.8/Makefile 2020-10-09 20:17:09.301016848 +0200
4 # whether or not to overwrite TLS certificates
8 DEFS:= $(DEFS_EXTRA_OPTS)
12 # Install everything (except modules-docbook?)
13 install: install-app install-console install-modules-all
15 -opensipsmc: $(cfg_prefix)/$(cfg_dir) $(data_prefix)/$(data_dir)
16 +opensipsmc: $(cfg_dir) $(data_dir)
17 $(MAKE) -C menuconfig proper
18 $(MAKE) -C menuconfig \
19 MENUCONFIG_CFG_PATH=$(data_target)/menuconfig_templates/ \
24 -mk-install-dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \
25 - $(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \
26 - $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \
27 - $(data_prefix)/$(data_dir)
28 +mk-install-dirs: $(cfg_dir) $(bin_dir) \
29 + $(modules_dir) $(doc_dir) \
30 + $(man_dir)/man8 $(man_dir)/man5 \
34 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
35 -install-cfg: $(cfg_prefix)/$(cfg_dir)
36 +install-cfg: $(cfg_dir)
37 sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules_target)#g" \
38 < etc/$(NAME).cfg > $(cfg_prefix)/$(cfg_dir)$(NAME).cfg.sample0
39 umask 0077; sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg_target)tls/#g" \
41 $(cfg_prefix)/$(cfg_dir)/osipsconsolerc; \
44 -install-console: $(bin_prefix)/$(bin_dir)
45 +install-console: $(bin_dir)
46 # install osipsconsole
47 cat scripts/osipsconsole | \
48 sed -e "s#PATH_BIN[ \t]*=[ \t]*\"\./\"#PATH_BIN = \"$(bin-target)\"#g" | \
50 $(INSTALL_BIN) /tmp/osipsconsole $(bin_prefix)/$(bin_dir)
51 rm -fr /tmp/osipsconsole
53 -install-bin: app $(bin_prefix)/$(bin_dir) opensipsmc utils
54 +install-bin: app $(bin_dir) opensipsmc utils
55 # install opensips binary
56 $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
57 $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
59 cd utils/db_oracle; $(MAKE) all ; \
62 -install-modules: modules $(modules_prefix)/$(modules_dir)
63 +install-modules: modules $(modules_dir)
64 @for r in $(modules_full_path) "" ; do \
65 if [ -n "$$r" ]; then \
66 if [ -f "$$r" ]; then \
68 .PHONY: install-doc install-app-doc install-modules-doc
69 install-doc: install-app-doc install-modules-doc
71 -install-app-doc: $(doc_prefix)/$(doc_dir)
72 +install-app-doc: $(doc_dir)
73 -@for d in $(install_docs) ""; do \
74 if [ -n "$$d" ]; then \
75 $(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$d" ; \
80 -install-modules-doc: $(doc_prefix)/$(doc_dir)
81 +install-modules-doc: $(doc_dir)
82 -@for r in $(modules_basenames) "" ; do \
83 if [ -n "$$r" ]; then \
84 if [ -f modules/"$$r"/README ]; then \
89 -install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
90 +install-man: $(man_dir)/man8 $(man_dir)/man5
91 sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg_target)$(NAME).cfg#g" \
92 -e "s#/usr/sbin/#$(bin-target)#g" \
93 -e "s#/usr/lib/$(NAME)/modules/#$(modules_target)#g" \
95 $(man_prefix)/$(man_dir)/man8/opensipsunix.8
96 chmod 644 $(man_prefix)/$(man_dir)/man8/opensipsunix.8
98 -install-modules-docbook: $(doc_prefix)/$(doc_dir)
99 +install-modules-docbook: $(doc_dir)
100 -@for r in $(modules_basenames) "" ; do \
101 if [ -n "$$r" ]; then \
102 if [ -d modules/"$$r"/doc ]; then \
103 diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile.defs opensips-2.4.0/Makefile.defs
104 --- opensips-2.4.0.orig/Makefile.defs 2018-04-30 21:37:06.000000000 +0900
105 +++ opensips-2.4.0/Makefile.defs 2018-05-23 19:46:05.110927079 +0900
108 # check if already included/exported
110 -ifeq ($(makefile_defs), 1)
113 -export makefile_defs
118 @@ -1657,5 +1652,3 @@
119 test_objs := $(test_src:.c=.o)
120 objs := $(objs) $(test_objs)
123 -endif # ifeq ($(makefile_defs, 1)
124 diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile.rules opensips-2.4.0/Makefile.rules
125 --- opensips-2.4.0.orig/Makefile.rules 2018-04-30 21:37:06.000000000 +0900
126 +++ opensips-2.4.0/Makefile.rules 2018-05-23 19:46:45.491993230 +0900
128 END { print "#endif /* __MEM_STAT_H_ */\n#endif /* SHM_EXTRA_STATS */"; \
129 print "/* modules MD5: $(MODULES_MD5) */"; fflush()}' > $@
131 -$(cfg_prefix)/$(cfg_dir):
133 mkdir -m 700 -p $(cfg_prefix)/$(cfg_dir)
135 -$(bin_prefix)/$(bin_dir):
137 mkdir -p $(bin_prefix)/$(bin_dir)
139 -$(modules_prefix)/$(modules_dir):
141 mkdir -p $(modules_prefix)/$(modules_dir)
143 -$(doc_prefix)/$(doc_dir):
145 mkdir -p $(doc_prefix)/$(doc_dir)
147 -$(man_prefix)/$(man_dir)/man8:
149 mkdir -p $(man_prefix)/$(man_dir)/man8
151 -$(man_prefix)/$(man_dir)/man5:
153 mkdir -p $(man_prefix)/$(man_dir)/man5
155 -$(data_prefix)/$(data_dir):
157 mkdir -p $(data_prefix)/$(data_dir)