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
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 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) utils
55 +install-bin: $(bin-dir) 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 + echo $(modules_full_path)
66 @for r in $(modules_full_path) "" ; do \
67 if [ -n "$$r" ]; then \
68 if [ -f "$$r" ]; then \
70 .PHONY: install-doc install-app-doc install-modules-doc
71 install-doc: install-app-doc install-modules-doc
73 -install-app-doc: $(doc-prefix)/$(doc-dir)
74 +install-app-doc: $(doc-dir)
75 -@for d in $(install_docs) ""; do \
76 $(INSTALL_TOUCH) $(doc-prefix)/$(doc-dir)/"$$d" ; \
77 $(INSTALL_DOC) "$$d" $(doc-prefix)/$(doc-dir) ; \
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 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
109 # check if already included/exported
111 -ifeq ($(makefile_defs), 1)
114 -export makefile_defs
119 @@ -1515,6 +1510,3 @@
120 DEFS+= -DUSE_SYSV_SEM # try sys v sems
121 found_lock_method=yes
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
133 -$(cfg-prefix)/$(cfg-dir):
135 mkdir -p $(cfg-prefix)/$(cfg-dir)
137 -$(bin-prefix)/$(bin-dir):
139 mkdir -p $(bin-prefix)/$(bin-dir)
141 -$(modules-prefix)/$(modules-dir):
143 mkdir -p $(modules-prefix)/$(modules-dir)
145 -$(doc-prefix)/$(doc-dir):
147 mkdir -p $(doc-prefix)/$(doc-dir)
149 -$(man-prefix)/$(man-dir)/man8:
151 mkdir -p $(man-prefix)/$(man-dir)/man8
153 -$(man-prefix)/$(man-dir)/man5:
155 mkdir -p $(man-prefix)/$(man-dir)/man5
157 -$(data-prefix)/$(data-dir):
159 mkdir -p $(data-prefix)/$(data-dir)