--- asterisk-addons/Makefile.orig 2005-07-30 21:04:44.000000000 +0200 +++ asterisk-addons/Makefile 2005-07-30 21:06:06.000000000 +0200 @@ -16,7 +16,6 @@ MODS=format_mp3/format_mp3.so app_saycountpl.so CFLAGS+=-fPIC -CFLAGS+=-I../asterisk CFLAGS+=-D_GNU_SOURCE INSTALL=install @@ -27,17 +26,11 @@ # # MySQL stuff... Autoconf anyone?? # -MODS+=$(shell if [ -d /usr/local/mysql/include ] || [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_addon_mysql.so app_addon_sql_mysql.so res_config_mysql.so"; fi) -CFLAGS+=$(shell if [ -d /usr/local/mysql/include ]; then echo "-I/usr/local/mysql/include"; fi) +MODS+=$(shell if [ -d /usr/include/mysql ]; then echo "cdr_addon_mysql.so app_addon_sql_mysql.so res_config_mysql.so"; fi) CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi) -CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi) -CFLAGS+=$(shell if [ -d /opt/mysql/include/mysql ]; then echo "-I/opt/mysql/include/mysql"; fi) MLFLAGS= -MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi) MLFLAGS+=$(shell if [ -d /usr/lib64/mysql ]; then echo "-L/usr/lib64/mysql"; fi) -MLFLAGS+=$(shell if [ -d /usr/local/mysql/lib ]; then echo "-L/usr/local/mysql/lib"; fi) -MLFLAGS+=$(shell if [ -d /usr/local/lib/mysql ]; then echo "-L/usr/local/lib/mysql"; fi) -MLFLAGS+=$(shell if [ -d /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi) +MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi) OSARCH=$(shell uname -s) @@ -55,7 +48,8 @@ format_mp3/format_mp3.so: $(MAKE) -C format_mp3 all -install: all +install: + $(INSTALL) -m 755 -d $(DESTDIR)$(MODULES_DIR) for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done clean: