]>
Commit | Line | Data |
---|---|---|
f274b6d5 JR |
1 | diff -ur opensips-2.1.1/Makefile opensips-2.1.1.make/Makefile |
2 | --- opensips-2.1.1/Makefile 2015-08-27 17:06:47.000000000 +0200 | |
3 | +++ opensips-2.1.1.make/Makefile 2016-01-01 14:30:11.252303815 +0100 | |
4 | @@ -55,7 +55,6 @@ | |
5 | tls_overwrite_certs?= | |
6 | ||
7 | ||
8 | -makefile_defs=0 | |
9 | DEFS:= | |
10 | DEBUG_PARSER?= | |
11 | ||
12 | @@ -476,7 +475,7 @@ | |
13 | # Install everything (except modules-docbook?) | |
14 | install: install-app install-console install-modules-all | |
15 | ||
1385cae0 JR |
16 | -opensipsmc: $(cfg_prefix)/$(cfg_dir) $(data_prefix)/$(data_dir) |
17 | +opensipsmc: $(cfg_dir) $(data_dir) | |
f274b6d5 JR |
18 | $(MAKE) -C menuconfig proper |
19 | $(MAKE) -C menuconfig \ | |
20 | MENUCONFIG_CFG_PATH=$(data-target)/menuconfig_templates/ \ | |
21 | @@ -493,14 +492,14 @@ | |
22 | $(MAKE) -C db/schema | |
23 | -@echo "Done" | |
24 | ||
1385cae0 JR |
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 \ | |
32 | + $(data_dir) | |
f274b6d5 JR |
33 | |
34 | ||
35 | # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work | |
1385cae0 JR |
36 | -install-cfg: $(cfg_prefix)/$(cfg_dir) |
37 | +install-cfg: $(cfg_dir) | |
f274b6d5 | 38 | sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \ |
1385cae0 | 39 | < etc/$(NAME).cfg > $(cfg_prefix)/$(cfg_dir)$(NAME).cfg.sample0 |
f274b6d5 JR |
40 | sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-target)tls/#g" \ |
41 | @@ -531,7 +530,7 @@ | |
1385cae0 | 42 | $(cfg_prefix)/$(cfg_dir)/osipsconsolerc; \ |
f274b6d5 JR |
43 | fi |
44 | ||
1385cae0 JR |
45 | -install-console: $(bin_prefix)/$(bin_dir) |
46 | +install-console: $(bin_dir) | |
f274b6d5 JR |
47 | # install osipsconsole |
48 | cat scripts/osipsconsole | \ | |
49 | sed -e "s#PATH_BIN[ \t]*=[ \t]*\"\./\"#PATH_BIN = \"$(bin-target)\"#g" | \ | |
50 | @@ -544,7 +543,7 @@ | |
1385cae0 | 51 | $(INSTALL_BIN) /tmp/osipsconsole $(bin_prefix)/$(bin_dir) |
f274b6d5 JR |
52 | rm -fr /tmp/osipsconsole |
53 | ||
1385cae0 JR |
54 | -install-bin: $(bin_prefix)/$(bin_dir) utils |
55 | +install-bin: $(bin_dir) utils | |
f274b6d5 | 56 | # install opensips binary |
1385cae0 JR |
57 | $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) |
58 | $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir) | |
f274b6d5 JR |
59 | @@ -615,7 +614,8 @@ |
60 | cd utils/db_oracle; $(MAKE) all ; \ | |
61 | fi ; | |
62 | ||
1385cae0 JR |
63 | -install-modules: modules $(modules_prefix)/$(modules_dir) |
64 | +install-modules: modules $(modules_dir) | |
f274b6d5 JR |
65 | + echo $(modules_full_path) |
66 | @for r in $(modules_full_path) "" ; do \ | |
67 | if [ -n "$$r" ]; then \ | |
68 | if [ -f "$$r" ]; then \ | |
69 | @@ -633,14 +633,14 @@ | |
70 | .PHONY: install-doc install-app-doc install-modules-doc | |
71 | install-doc: install-app-doc install-modules-doc | |
72 | ||
1385cae0 JR |
73 | -install-app-doc: $(doc_prefix)/$(doc_dir) |
74 | +install-app-doc: $(doc_dir) | |
f274b6d5 | 75 | -@for d in $(install_docs) ""; do \ |
1385cae0 JR |
76 | $(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$d" ; \ |
77 | $(INSTALL_DOC) "$$d" $(doc_prefix)/$(doc_dir) ; \ | |
f274b6d5 JR |
78 | done |
79 | ||
80 | ||
1385cae0 JR |
81 | -install-modules-doc: $(doc_prefix)/$(doc_dir) |
82 | +install-modules-doc: $(doc_dir) | |
f274b6d5 JR |
83 | -@for r in $(modules_basenames) "" ; do \ |
84 | if [ -n "$$r" ]; then \ | |
85 | if [ -f modules/"$$r"/README ]; then \ | |
86 | @@ -652,7 +652,7 @@ | |
87 | done | |
88 | ||
89 | ||
1385cae0 JR |
90 | -install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 |
91 | +install-man: $(man_dir)/man8 $(man_dir)/man5 | |
f274b6d5 JR |
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" \ | |
95 | @@ -679,7 +679,7 @@ | |
1385cae0 JR |
96 | $(man_prefix)/$(man_dir)/man8/opensipsunix.8 |
97 | chmod 644 $(man_prefix)/$(man_dir)/man8/opensipsunix.8 | |
f274b6d5 | 98 | |
1385cae0 JR |
99 | -install-modules-docbook: $(doc_prefix)/$(doc_dir) |
100 | +install-modules-docbook: $(doc_dir) | |
f274b6d5 JR |
101 | -@for r in $(modules_basenames) "" ; do \ |
102 | if [ -n "$$r" ]; then \ | |
103 | if [ -d modules/"$$r"/doc ]; then \ | |
104 | diff -ur opensips-2.1.1/Makefile.defs opensips-2.1.1.make/Makefile.defs | |
105 | --- opensips-2.1.1/Makefile.defs 2015-08-27 17:06:47.000000000 +0200 | |
106 | +++ opensips-2.1.1.make/Makefile.defs 2016-01-01 14:29:50.262273910 +0100 | |
107 | @@ -51,11 +51,6 @@ | |
108 | ||
109 | # check if already included/exported | |
110 | ||
111 | -ifeq ($(makefile_defs), 1) | |
112 | -else | |
113 | -makefile_defs=1 | |
114 | -export makefile_defs | |
115 | - | |
116 | # main binary name | |
117 | MAIN_NAME=opensips | |
118 | ||
119 | @@ -1515,6 +1510,3 @@ | |
120 | DEFS+= -DUSE_SYSV_SEM # try sys v sems | |
121 | found_lock_method=yes | |
122 | endif | |
123 | - | |
124 | - | |
125 | -endif # ifeq ($(makefile_defs, 1) | |
126 | diff -ur opensips-2.1.1/Makefile.rules opensips-2.1.1.make/Makefile.rules | |
127 | --- opensips-2.1.1/Makefile.rules 2015-08-27 17:06:47.000000000 +0200 | |
128 | +++ opensips-2.1.1.make/Makefile.rules 2016-01-01 14:03:59.144326624 +0100 | |
129 | @@ -61,25 +61,25 @@ | |
130 | cp $< $@; \ | |
131 | fi | |
132 | ||
1385cae0 JR |
133 | -$(cfg_prefix)/$(cfg_dir): |
134 | +$(cfg_dir): | |
135 | mkdir -p $(cfg_prefix)/$(cfg_dir) | |
f274b6d5 | 136 | |
1385cae0 JR |
137 | -$(bin_prefix)/$(bin_dir): |
138 | +$(bin_dir): | |
139 | mkdir -p $(bin_prefix)/$(bin_dir) | |
f274b6d5 | 140 | |
1385cae0 JR |
141 | -$(modules_prefix)/$(modules_dir): |
142 | +$(modules_dir): | |
143 | mkdir -p $(modules_prefix)/$(modules_dir) | |
f274b6d5 | 144 | |
1385cae0 JR |
145 | -$(doc_prefix)/$(doc_dir): |
146 | +$(doc_dir): | |
147 | mkdir -p $(doc_prefix)/$(doc_dir) | |
f274b6d5 | 148 | |
1385cae0 JR |
149 | -$(man_prefix)/$(man_dir)/man8: |
150 | +$(man_dir)/man8: | |
151 | mkdir -p $(man_prefix)/$(man_dir)/man8 | |
f274b6d5 | 152 | |
1385cae0 JR |
153 | -$(man_prefix)/$(man_dir)/man5: |
154 | +$(man_dir)/man5: | |
155 | mkdir -p $(man_prefix)/$(man_dir)/man5 | |
f274b6d5 | 156 | |
1385cae0 JR |
157 | -$(data_prefix)/$(data_dir): |
158 | +$(data_dir): | |
159 | mkdir -p $(data_prefix)/$(data_dir) | |
f274b6d5 JR |
160 | |
161 |