From 55433a710708f15d200954ef208b5b7c06841a11 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Sun, 13 Apr 2008 11:51:02 +0000 Subject: [PATCH] - Makefiles fix o DESTDIR is only used as installation target directory. Allows staging compile. o xxx-target used in sub-makefiles o CXX/CC taken from env variables - some minor compililation fixes git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@882 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- Makefile | 4 +- Makefile.defs | 42 +++++++------ apps/Makefile | 2 +- apps/examples/Makefile | 2 +- apps/examples/tutorial/Makefile | 2 +- apps/ivr/Makefile | 6 +- apps/ivr/Makefile.ivr_application | 18 +++--- apps/py_sems/Makefile | 8 +-- apps/py_sems/Makefile.py_sems_application | 16 ++--- apps/voicemail/Makefile | 13 ++-- core/Makefile | 62 ++++++++++--------- core/plug-in/Makefile | 2 +- core/plug-in/Makefile.app_module | 24 +++---- core/plug-in/Makefile.audio_module | 6 +- .../binrpcctrl/libbinrpc/Makefile.defs | 2 +- core/plug-in/gsm/gsm-1.0-pl10/src/code.c | 1 + core/sems.h | 2 +- 17 files changed, 108 insertions(+), 104 deletions(-) diff --git a/Makefile b/Makefile index 38227726..7dd01de4 100644 --- a/Makefile +++ b/Makefile @@ -93,10 +93,10 @@ tar: (mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \ cd tmp/_tar1; $(TAR) -xf - ) && \ mv tmp/_tar1/$(notdir $(CURDIR)) \ - tmp/_tar2/"$(NAME)-$(RELEASE)" && \ + tmp/_tar2/"$(NAME)-$(REL_VERSION)" && \ (cd tmp/_tar2 && $(TAR) \ -zcf ../../"$(NAME)-$(RELEASE)".tar.gz \ - "$(NAME)-$(RELEASE)" ) ; \ + "$(NAME)-$(REL_VERSION)" ) ; \ rm -rf tmp ser-0.9.6-sems_src.tar.gz: diff --git a/Makefile.defs b/Makefile.defs index c389b51c..c6e25823 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1,4 +1,4 @@ -SVN_REV=r$(shell svnversion -n .) +SVN_REV?=r$(shell svnversion -n .) #version number VERSION = 1 @@ -6,7 +6,8 @@ PATCHLEVEL = 0 SUBLEVEL = 0 EXTRAVERSION ?= -pre-$(SVN_REV) -RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL) +RELEASE=$(REL_VERSION)$(EXTRAVERSION) CPPFLAGS += -D_DEBUG \ -D_THREAD_SAFE -D_REENTRANT \ @@ -72,8 +73,8 @@ ifeq ($(ARCH),sparc) endif # need OS specific for this ? -CXX = g++ -CC = gcc +CXX ?= g++ +CC ?= gcc LD = $(CC) @@ -133,8 +134,8 @@ LIB_LDFLAGS += $(LDFLAGS) # basedir=/tmp # prefix=/usr/local -DESTDIR ?= /usr/local -PREFIX ?= $(DESTDIR) +DESTDIR ?= +PREFIX ?= /usr/local prefix = $(PREFIX) BASEDIR ?= basedir = $(BASEDIR) @@ -212,23 +213,24 @@ INSTALL-DOC = $(INSTALL) -m 644 INSTALL-AUDIO = $(INSTALL) -m 644 -mk-install-dirs: $(cfg-prefix)/$(cfg-dir) $(bin-prefix)/$(bin-dir) \ - $(modules-prefix)/$(modules-dir) \ - $(audio-prefix)/$(audio-dir) \ - $(doc-prefix)/$(doc-dir) +mk-install-dirs: $(DESTDIR)$(cfg-target) \ + $(DESTDIR)$(bin-prefix)/$(bin-dir) \ + $(DESTDIR)$(modules-prefix)/$(modules-dir) \ + $(DESTDIR)$(audio-prefix)/$(audio-dir) \ + $(DESTDIR)$(doc-prefix)/$(doc-dir) -$(cfg-prefix)/$(cfg-dir): - mkdir -p $(cfg-prefix)/$(cfg-dir) +$(DESTDIR)$(cfg-target): + mkdir -p $(DESTDIR)$(cfg-target) -$(bin-prefix)/$(bin-dir): - mkdir -p $(bin-prefix)/$(bin-dir) +$(DESTDIR)$(bin-prefix)/$(bin-dir): + mkdir -p $(DESTDIR)$(bin-prefix)/$(bin-dir) -$(modules-prefix)/$(modules-dir): - mkdir -p $(modules-prefix)/$(modules-dir) +$(DESTDIR)$(modules-prefix)/$(modules-dir): + mkdir -p $(DESTDIR)$(modules-prefix)/$(modules-dir) -$(audio-prefix)/$(audio-dir): - mkdir -p $(audio-prefix)/$(audio-dir) +$(DESTDIR)$(audio-prefix)/$(audio-dir): + mkdir -p $(DESTDIR)$(audio-prefix)/$(audio-dir) -$(doc-prefix)/$(doc-dir): - mkdir -p $(doc-prefix)/$(doc-dir) +$(DESTDIR)$(doc-prefix)/$(doc-dir): + mkdir -p $(DESTDIR)$(doc-prefix)/$(doc-dir) diff --git a/apps/Makefile b/apps/Makefile index f4dc303e..c4893ca7 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -52,7 +52,7 @@ install-bin: done .PHONY: install-cfg -install-cfg: $(cfg-prefix)/$(cfg-dir) +install-cfg: $(DESTDIR)$(cfg-target) -@for r in $(modules) "" ; do \ if [ -n "$$r" ]; then \ echo "" ; \ diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 6010a28d..d1d871af 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -46,7 +46,7 @@ install-bin: done .PHONY: install-cfg -install-cfg: $(cfg-prefix)/$(cfg-dir) +install-cfg: $(DESTDIR)$(cfg-target) -@for r in $(modules) "" ; do \ if [ -n "$$r" ]; then \ echo "" ; \ diff --git a/apps/examples/tutorial/Makefile b/apps/examples/tutorial/Makefile index 563d4448..f451a1d0 100644 --- a/apps/examples/tutorial/Makefile +++ b/apps/examples/tutorial/Makefile @@ -46,7 +46,7 @@ install-bin: done .PHONY: install-cfg -install-cfg: $(cfg-prefix)/$(cfg-dir) +install-cfg: $(DESTDIR)$(cfg-target) -@for r in $(modules) "" ; do \ if [ -n "$$r" ]; then \ echo "" ; \ diff --git a/apps/ivr/Makefile b/apps/ivr/Makefile index 01d7e828..9ca29c33 100644 --- a/apps/ivr/Makefile +++ b/apps/ivr/Makefile @@ -92,12 +92,12 @@ PYTHON_module_ldflags += -Xlinker --export-dynamic endif .PHONY: install_python_files -install_python_files: $(modules-prefix)/$(modules-dir) +install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir) echo "Installing Python object files..." for f in $(py_obj) ; do \ if [ -n "py/$$f" ]; then \ - $(INSTALL-TOUCH) $(modules-prefix)/$(modules-dir)/$$f; \ - $(INSTALL-MODULES) py/$$f $(modules-prefix)/$(modules-dir)/$$f; \ + $(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \ + $(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \ fi ; \ done diff --git a/apps/ivr/Makefile.ivr_application b/apps/ivr/Makefile.ivr_application index e6450bff..58ceeb3c 100644 --- a/apps/ivr/Makefile.ivr_application +++ b/apps/ivr/Makefile.ivr_application @@ -25,7 +25,7 @@ PYCHECKERDOCARGS = --classdoc --funcdoc module_conf_files = $(wildcard etc/*) .PHONY: all -all: clean compile +all: compile .PHONY: clean clean: @@ -38,26 +38,26 @@ compile: .PHONY: install install: all - install -d ${BASEDIR}/${LIB_INSTALLDIR} - install -m ${LIB_PERMISSIONS} *.pyc ${BASEDIR}/${LIB_INSTALLDIR} - install -d ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} - install -m ${LIB_PERMISSIONS} ${LIBDIR}/*.pyc ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} + install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR} + install -m ${LIB_PERMISSIONS} *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR} + install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} + install -m ${LIB_PERMISSIONS} ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} .PHONY: install-cfg install-cfg: - mkdir -p $(cfg-prefix)/$(cfg-dir)etc + mkdir -p $(DESTDIR)$(cfg-target)etc -@for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)$$r ; \ + $(INSTALL-TOUCH) $(DESTDIR)$(cfg-target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \ -e "s#/usr/.*etc/sems#$(cfg-target)#g" \ - < $$r > $(cfg-prefix)/$(cfg-dir)$$r; \ + < $$r > $(DESTDIR)$(cfg-target)$$r; \ done uninstall: - @echo "please remove the files from ${LIB_INSTALLDIR} manually." + @echo "please remove the files from $(DESTDIR)${LIB_INSTALLDIR} manually." fulltest: find | grep /Test | grep -v ".svn" | grep \\.py$$ | sed -e "s#^./##g" | bash -e - diff --git a/apps/py_sems/Makefile b/apps/py_sems/Makefile index 26d37808..f071682c 100644 --- a/apps/py_sems/Makefile +++ b/apps/py_sems/Makefile @@ -82,17 +82,17 @@ LD=gcc include $(COREPATH)/plug-in/Makefile.app_module .PHONY: install_python_files -install_python_files: $(modules-prefix)/$(modules-dir) +install_python_files: $(DESTDIR)$(modules-prefix)/$(modules-dir) echo "Installing Python object files..." for f in $(py_obj) ; do \ if [ -n "py/$$f" ]; then \ - $(INSTALL-TOUCH) $(modules-prefix)/$(modules-dir)/$$f; \ - $(INSTALL-MODULES) py/$$f $(modules-prefix)/$(modules-dir)/$$f; \ + $(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \ + $(INSTALL-MODULES) py/$$f $(DESTDIR)$(modules-prefix)/$(modules-dir)/$$f; \ fi ; \ done echo "Installing py_sems script path..." - $(INSTALL-MODULES) -d $(modules-prefix)/$(py-sems-modules-dir) + $(INSTALL-MODULES) -d $(DESTDIR)$(modules-prefix)/$(py-sems-modules-dir) .PHONY: clean_py_sems_lib clean_py_sems_lib: diff --git a/apps/py_sems/Makefile.py_sems_application b/apps/py_sems/Makefile.py_sems_application index 228d1637..0cccd091 100644 --- a/apps/py_sems/Makefile.py_sems_application +++ b/apps/py_sems/Makefile.py_sems_application @@ -35,26 +35,26 @@ compile: .PHONY: install install: all - install -d ${BASEDIR}/${LIB_INSTALLDIR} - install -m ${LIB_PERMISSIONS} *.pyc ${BASEDIR}/${LIB_INSTALLDIR} - install -d ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} - install -m ${LIB_PERMISSIONS} ${LIBDIR}/*.pyc ${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} + install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR} + install -m ${LIB_PERMISSIONS} *.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR} + install -d $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} + install -m ${LIB_PERMISSIONS} ${LIBDIR}/*.pyc $(DESTDIR)${BASEDIR}/${LIB_INSTALLDIR}/${LIBDIR} .PHONY: install-cfg install-cfg: - mkdir -p $(cfg-prefix)/$(cfg-dir)etc + mkdir -p $(cfg-target)etc -@for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)$$r ; \ + $(INSTALL-TOUCH) $(cfg-target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \ -e "s#/usr/.*etc/sems#$(cfg-target)#g" \ - < $$r > $(cfg-prefix)/$(cfg-dir)$$r; \ + < $$r > $(DESTDIR)$(cfg-target)$$r; \ done uninstall: - @echo "please remove the files from ${LIB_INSTALLDIR} manually." + @echo "please remove the files from $(DESTDIR)${LIB_INSTALLDIR} manually." fulltest: find | grep /Test | grep -v ".svn" | grep \\.py$$ | sed -e "s#^./##g" | bash -e - diff --git a/apps/voicemail/Makefile b/apps/voicemail/Makefile index 7ec9ed3d..facd57a5 100644 --- a/apps/voicemail/Makefile +++ b/apps/voicemail/Makefile @@ -21,13 +21,12 @@ extra_install = install_email_template $(plug_in_name)_audio vm_module: all .PHONY: install_email_template -install_email_template: $(cfg-prefix)/$(cfg-dir) - mkdir -p $(cfg-prefix)/$(cfg-dir) - $(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)default.template.sample - $(INSTALL-CFG) default.template.sample $(cfg-prefix)/$(cfg-dir) - if [ ! -f $(cfg-prefix)/$(cfg-dir)default.template ]; then \ - cp -f $(cfg-prefix)/$(cfg-dir)default.template.sample \ - $(cfg-prefix)/$(cfg-dir)default.template; \ +install_email_template: $(DESTDIR)$(cfg-target) + $(INSTALL-TOUCH) $(DESTDIR)$(cfg-target)default.template.sample + $(INSTALL-CFG) default.template.sample $(DESTDIR)$(cfg-target) + if [ ! -f $(DESTDIR)$(cfg-target)default.template ]; then \ + cp -f $(DESTDIR)$(cfg-target)default.template.sample \ + $(DESTDIR)$(cfg-target)default.template; \ fi diff --git a/core/Makefile b/core/Makefile index d9e4baa1..a58f1359 100644 --- a/core/Makefile +++ b/core/Makefile @@ -72,64 +72,66 @@ $(NAME): $(NAME).o $(OBJS) ../Makefile.defs $(LD) -o $(NAME) $(NAME).o $(OBJS) $(LDFLAGS) install: all mk-install-dirs \ + install-audio \ + install-doc \ + install-modules-cfg \ install-cfg \ install-bin \ install-modules \ - install-doc \ - install-modules-cfg \ - install-audio \ + + # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work -install-cfg: $(cfg-prefix)/$(cfg-dir) +install-cfg: $(DESTDIR)$(cfg-target) sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \ -e "s#/usr/.*etc/sems#$(cfg-target)#g" \ - < etc/sems.conf.sample > $(cfg-prefix)/$(cfg-dir)sems.conf.default - chmod 644 $(cfg-prefix)/$(cfg-dir)sems.conf.default - if [ ! -f $(cfg-prefix)/$(cfg-dir)sems.conf ]; then \ - cp -f $(cfg-prefix)/$(cfg-dir)sems.conf.default \ - $(cfg-prefix)/$(cfg-dir)sems.conf; \ + < etc/sems.conf.sample > $(DESTDIR)$(cfg-target)sems.conf.default + chmod 644 $(DESTDIR)$(cfg-target)sems.conf.default + if [ ! -f $(DESTDIR)$(cfg-target)sems.conf ]; then \ + cp -f $(DESTDIR)$(cfg-target)sems.conf.default \ + $(DESTDIR)$(cfg-target)sems.conf; \ fi - # Make sure the destination exists and is a directory! - mkdir -p $(cfg-prefix)/$(cfg-dir)etc - $(INSTALL-CFG) etc/app_mapping.conf $(cfg-prefix)/$(cfg-dir)etc/ +# Make sure the destination exists and is a directory! + mkdir -p $(DESTDIR)$(cfg-target)etc + $(INSTALL-CFG) etc/app_mapping.conf $(DESTDIR)$(cfg-target)etc/ -install-bin: $(bin-prefix)/$(bin-dir) - $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)$(NAME) - $(INSTALL-BIN) $(NAME) $(bin-prefix)/$(bin-dir) +install-bin: $(DESTDIR)$(bin-prefix)/$(bin-dir) + $(INSTALL-TOUCH) $(DESTDIR)$(bin-prefix)/$(bin-dir)$(NAME) + $(INSTALL-BIN) $(NAME) $(DESTDIR)$(bin-prefix)/$(bin-dir) -install-modules: $(PLUGIN_DIR) $(modules-prefix)/$(modules-dir) +install-modules: $(PLUGIN_DIR) $(DESTDIR)$(modules-prefix)/$(modules-dir) $(MAKE) -C $(PLUGIN_DIR) install -install-modules-cfg: $(PLUGIN_DIR) $(modules-prefix)/$(modules-dir) +install-modules-cfg: $(PLUGIN_DIR) $(MAKE) -C $(PLUGIN_DIR) install-cfg install-ser-cfg: etc/ser-sems.cfg - mkdir -p $(ser-cfg-target) + mkdir -p $(DESTDIR)$(ser-cfg-target) - if [ ! -f $(ser-cfg-target)/ser-sems.cfg ]; then \ + if [ ! -f $(DESTDIR)$(ser-cfg-target)/ser-sems.cfg ]; then \ sed -e "s#/opt/ser-sems#$(ser-prefix)#g" \ - < etc/ser-sems.cfg > $(ser-cfg-target)ser-sems.cfg; \ + < etc/ser-sems.cfg > $(DESTDIR)$(ser-cfg-target)ser-sems.cfg; \ fi - $(INSTALL-CFG) etc/ser-sems.cfg $(ser-cfg-target)ser-sems.cfg.default + $(INSTALL-CFG) etc/ser-sems.cfg $(DESTDIR)$(ser-cfg-target)ser-sems.cfg.default - @echo \*\*\* installed ser-sems.cfg at $(ser-cfg-target)ser-sems.cfg - @echo \*\*\* run $(ser-prefix)/sbin/ser -f $(ser-cfg-target)ser-sems.cfg + @echo \*\*\* installed ser-sems.cfg at $(DESTDIR)$(ser-cfg-target)ser-sems.cfg + @echo \*\*\* run $(DESTDIR)$(ser-prefix)/sbin/ser -f $(DESTDIR)$(ser-cfg-target)ser-sems.cfg @echo \*\*\* to start ser for sems. -install-audio: $(audio-prefix)/$(audio-dir) - -@for f in $(AUDIO_FILES) ; do \ +install-audio: $(DESTDIR)$(audio-prefix)/$(audio-dir) + for f in $(AUDIO_FILES) ; do \ if [ -n "wav/$$f" ]; then \ - $(INSTALL-TOUCH) $(audio-prefix)/$(audio-dir)$$f; \ - $(INSTALL-AUDIO) wav/$$f $(audio-prefix)/$(audio-dir)$$f; \ + $(INSTALL-TOUCH) $(DESTDIR)$(audio-prefix)/$(audio-dir)$$f; \ + $(INSTALL-AUDIO) wav/$$f $(DESTDIR)$(audio-prefix)/$(audio-dir)$$f; \ fi ; \ done -install-doc: $(doc-prefix)/$(doc-dir) - $(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)README - $(INSTALL-DOC) ../README $(doc-prefix)/$(doc-dir) +install-doc: $(DESTDIR)$(doc-prefix)/$(doc-dir) + $(INSTALL-TOUCH) $(DESTDIR)$(doc-prefix)/$(doc-dir)README + $(INSTALL-DOC) ../README $(DESTDIR)$(doc-prefix)/$(doc-dir) dist: tar diff --git a/core/plug-in/Makefile b/core/plug-in/Makefile index 0c4dee47..86a85ec6 100644 --- a/core/plug-in/Makefile +++ b/core/plug-in/Makefile @@ -44,7 +44,7 @@ install: done .PHONY: install-cfg -install-cfg: $(cfg-prefix)/$(cfg-dir) +install-cfg: $(cfg-target) -@for r in $(modules) "" ; do \ if [ -n "$$r" ]; then \ echo "" ; \ diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module index 4d6595ca..1dffe547 100644 --- a/core/plug-in/Makefile.app_module +++ b/core/plug-in/Makefile.app_module @@ -43,36 +43,36 @@ deps: $(depends) $(extra_depends) .PHONY: install install: all $(extra_install) - mkdir -p $(modules-prefix)/$(modules-dir) + mkdir -p $(DESTDIR)$(modules-prefix)/$(modules-dir) if [ -f "$(lib_name)" ]; then \ - $(INSTALL-TOUCH) $(modules-prefix)/$(modules-dir)/$(lib_name) ; \ - $(INSTALL-MODULES) $(lib_name) $(modules-prefix)/$(modules-dir); \ + $(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$(lib_name) ; \ + $(INSTALL-MODULES) $(lib_name) $(DESTDIR)$(modules-prefix)/$(modules-dir); \ fi .PHONY: install-cfg install-cfg: - mkdir -p $(cfg-prefix)/$(cfg-dir)etc + mkdir -p $(DESTDIR)$(cfg-target)etc -@for r in $(module_conf_files); do \ echo installing $$r ; \ - $(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)$$r ; \ + $(INSTALL-TOUCH) $(DESTDIR)$(cfg-target)$$r ; \ sed -e "s#/usr/.*lib/sems/audio/#$(audio-target)#g" \ -e "s#/usr/.*lib/sems/plug-in/#$(modules-target)#g" \ -e "s#/usr/.*lib/sems/ivr/#$(lib-target)ivr/#g" \ -e "s#/usr/.*lib/sems/py_sems/#$(lib-target)py_sems/#g" \ -e "s#/usr/.*etc/sems#$(cfg-target)#g" \ - < $$r > $(cfg-prefix)/$(cfg-dir)$$r; \ + < $$r > $(DESTDIR)$(cfg-target)$$r; \ done -(audio-prefix)/$(audio-dir): - mkdir -p $(audio-prefix)/$(audio-dir) +$(DESTDIR)(audio-prefix)/$(audio-dir): + mkdir -p $(DESTDIR)$(audio-prefix)/$(audio-dir) .PHONY: $(plug_in_name)_audio -$(plug_in_name)_audio: $(audio-prefix)/$(audio-dir) - mkdir -p $(audio-prefix)/$(audio-dir)$(plug_in_name) +$(plug_in_name)_audio: $(DESTDIR)$(audio-prefix)/$(audio-dir) + mkdir -p $(DESTDIR)$(audio-prefix)/$(audio-dir)$(plug_in_name) -@for f in $(AUDIO_FILES) ; do \ if [ -n "wav/$$f" ]; then \ - $(INSTALL-TOUCH) $(audio-prefix)/$(audio-dir)$(plug_in_name)/$$f; \ - $(INSTALL-AUDIO) wav/$$f $(audio-prefix)/$(audio-dir)$(plug_in_name)/$$f; \ + $(INSTALL-TOUCH) $(DESTDIR)$(audio-prefix)/$(audio-dir)$(plug_in_name)/$$f; \ + $(INSTALL-AUDIO) wav/$$f $(DESTDIR)$(audio-prefix)/$(audio-dir)$(plug_in_name)/$$f; \ fi ; \ done diff --git a/core/plug-in/Makefile.audio_module b/core/plug-in/Makefile.audio_module index 018968e6..0cc03356 100644 --- a/core/plug-in/Makefile.audio_module +++ b/core/plug-in/Makefile.audio_module @@ -30,9 +30,9 @@ deps: $(depends) .PHONY: install install: $(lib_name) $(extra_install) - mkdir -p $(modules-prefix)/$(modules-dir) - $(INSTALL-TOUCH) $(modules-prefix)/$(modules-dir)/$(lib_name) ; \ - $(INSTALL-MODULES) $(lib_name) $(modules-prefix)/$(modules-dir) + mkdir -p $(DESTDIR)$(modules-prefix)/$(modules-dir) + $(INSTALL-TOUCH) $(DESTDIR)$(modules-prefix)/$(modules-dir)/$(lib_name) ; \ + $(INSTALL-MODULES) $(lib_name) $(DESTDIR)$(modules-prefix)/$(modules-dir) .PHONY: install-cfg install-cfg : $(extra_install_cfg) diff --git a/core/plug-in/binrpcctrl/libbinrpc/Makefile.defs b/core/plug-in/binrpcctrl/libbinrpc/Makefile.defs index 6de6d1b5..b78e0c36 100644 --- a/core/plug-in/binrpcctrl/libbinrpc/Makefile.defs +++ b/core/plug-in/binrpcctrl/libbinrpc/Makefile.defs @@ -65,7 +65,7 @@ CFLAGS+=-DBINRPC_LIB_VER=\"$(MAJOR).$(MINOR)-$(TAG)\" CFLAGS += \ -DINT_AS_ID \ - #-DFIX_FALSE_GCC_WARNS \ + -DFIX_FALSE_GCC_WARNS \ #-DBINRPC_REENTRANT \ ifeq (,$(findstring BINRPC_REENTRANT,$(CFLAGS))) diff --git a/core/plug-in/gsm/gsm-1.0-pl10/src/code.c b/core/plug-in/gsm/gsm-1.0-pl10/src/code.c index f59a1dde..f2e55fae 100644 --- a/core/plug-in/gsm/gsm-1.0-pl10/src/code.c +++ b/core/plug-in/gsm/gsm-1.0-pl10/src/code.c @@ -15,6 +15,7 @@ # include "proto.h" extern char * memcpy P((char *, char *, int)); #endif +#include "string.h" #include "private.h" #include "gsm.h" diff --git a/core/sems.h b/core/sems.h index 0e2b5866..947f146b 100644 --- a/core/sems.h +++ b/core/sems.h @@ -29,7 +29,7 @@ #define _ans_machine_h_ #define CONFIG_FILE "/usr/local/etc/sems/sems.conf" -#define MOD_CFG_PATH "/usr/local/etc/sems/" +#define MOD_CFG_PATH "/usr/local/etc/sems/etc" #define SER_FIFO "/tmp/ser_fifo" #define FIFO_NAME "/tmp/am_fifo" #define SEND_METHOD "unix"