X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=Makefile.am;h=aaa23f6f11fd6ba0eb92d609336aaa8efda02453;hp=8e44c17aefd54a6d1fb3681d5c97e5a58163c24b;hb=0f805e041a900551a8c3cf9a75a78c2b34e1977c;hpb=51655a18970b6117e6102f6ca7541b53fb6f568e

diff --git a/Makefile.am b/Makefile.am
index 8e44c17..aaa23f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,23 +20,22 @@
 ##    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ##    Boston, MA 02110-1301, USA.
 
-#INSTALLdir = $(DESTDIR)/usr/local/lcr
+INSTALLdir = $(DESTDIR)/usr/local/lcr
 
 pkglogdir=$(localstatedir)/log/@PACKAGE@
 pkgsysconfdir=$(sysconfdir)/@PACKAGE@
 
-CONFIGdir=$(DESTDIR)$(pkgsysconfdir)
-SHAREdir=$(DESTDIR)$(pkgdatadir)
-LOGdir=$(DESTDIR)$(pkglogdir)
-EXTENSIONdir=$(DESTDIR)$(localstatedir)/lib/lcr/extensions
+#CONFIGdir=$(DESTDIR)$(pkgsysconfdir)
+#SHAREdir=$(DESTDIR)$(pkgdatadir)
+#LOGdir=$(DESTDIR)$(pkglogdir)
+#EXTENSIONdir=$(DESTDIR)$(localstatedir)/lib/lcr
 
+CONFIGdir=$(INSTALLdir)
+SHAREdir=$(INSTALLdir)
+LOGdir=$(INSTALLdir)
+EXTENSIONdir=$(INSTALLdir)/extensions
 
-#CONFIGdir=$(INSTALLdir)
-#SHAREdir=$(INSTALLdir)
-#LOGdir=$(INSTALLdir)
-#EXTENSIONdir=$(INSTALLdir)/extensions
-
-astmoddir = $(DESTDIR)/$(libdir)/asterisk/modules
+astmoddir = $(DESTDIR)/usr/lib/asterisk/modules
 
 INSTALLATION_DEFINES = \
  -DCONFIG_DATA="\"$(CONFIGdir)\"" \
@@ -46,11 +45,11 @@ INSTALLATION_DEFINES = \
 
 if ENABLE_GSM
 
-GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include
+GSM_INCLUDE = -DWITH_GSM -I./openbsc/include -I./libosmocore/include -I./openbsc
 
-GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/vty_interface.c openbsc/src/vty_interface_layer3.c
+GSM_SOURCE = gsm_audio.c gsm.cpp gsm_conf.c openbsc/src/bsc_init.c openbsc/src/bsc_vty.c openbsc/src/vty_interface_layer3.c openbsc/src/bsc_api.c openbsc/src/bsc_version.c
 
-GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -L./libosmocore/src/ -losmocore -ldbi -lcrypt
+GSM_LIB = /usr/lib/libgsm.a ./openbsc/src/libbsc.a ./openbsc/src/libmsc.a ./openbsc/src/libvty.a -losmovty -losmocore -ldbi -lcrypt
 
 #gsm_audio.po: gsm_audio.c gsm_audio.h
 #	$(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po