| 54198007 |
1 | diff -ur asterisk-0.7.2-orig/channels/h323/Makefile asterisk-0.7.2/channels/h323/Makefile |
| 2 | --- asterisk-0.7.2-orig/channels/h323/Makefile 2004-01-10 19:22:32.000000000 -0700 |
| 3 | +++ asterisk-0.7.2/channels/h323/Makefile 2004-02-21 15:08:50.624527898 -0700 |
| 4 | @@ -1,11 +1,11 @@ |
| 5 | # include the Makefile of OpenH323 |
| 6 | |
| 7 | ifndef OPENH323DIR |
| 8 | -OPENH323DIR=$(HOME)/openh323 |
| 9 | +OPENH323DIR=/usr |
| 10 | endif |
| 11 | |
| 12 | ifndef PWLIBDIR |
| 13 | -PWLIBDIR=$(HOME)/pwlib |
| 14 | +PWLIBDIR=/usr |
| 15 | endif |
| 16 | |
| 17 | ifndef ASTERISKDIR |
| 18 | @@ -32,8 +32,8 @@ |
| 19 | CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS |
| 20 | CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA |
| 21 | CFLAGS += -I../../include |
| 22 | -CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include |
| 23 | -CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations |
| 24 | +CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include/ptlib |
| 25 | +CFLAGS += -I$(OPENH323DIR)/include/openh323 |
| 26 | |
| 27 | |
| 28 | all: libchanh323.a |
| 29 | @@ -52,13 +52,13 @@ |
| 30 | ar cr libchanh323.a ast_h323.o |
| 31 | |
| 32 | chan_h323.so: |
| 33 | - g++ -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 34 | + g++ -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt -L$(OPENH323DIR)/lib -lh323 -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 35 | |
| 36 | chan_h323_d.so: chan_h323.o ast_h323.o |
| 37 | - g++ -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 38 | + g++ -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt -L$(OPENH323DIR)/lib -lh323 -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 39 | |
| 40 | chan_h323_s.so: chan_h323.o ast_h323.o |
| 41 | - g++ -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 42 | + g++ -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt -L$(OPENH323DIR)/lib -lh323 -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 43 | clean: |
| 44 | rm -f *.o *.so core.* libchanh323.a |
| 45 | |
| 46 | diff -ur asterisk-0.7.2-orig/channels/Makefile asterisk-0.7.2/channels/Makefile |
| 47 | --- asterisk-0.7.2-orig/channels/Makefile 2004-01-23 13:57:48.000000000 -0700 |
| 48 | +++ asterisk-0.7.2/channels/Makefile 2004-02-21 15:08:50.624527898 -0700 |
| 49 | @@ -147,7 +147,7 @@ |
| 50 | $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl |
| 51 | |
| 52 | chan_h323.so: chan_h323.o h323/libchanh323.a |
| 53 | - $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 54 | + $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -lpt -lopenh323 -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat |
| 55 | |
| 56 | |
| 57 | #chan_modem.so : chan_modem.o |
| 58 | diff -ur asterisk-0.7.2-orig/Makefile asterisk-0.7.2/Makefile |
| 59 | --- asterisk-0.7.2-orig/Makefile 2004-01-13 23:48:38.000000000 -0700 |
| 60 | +++ asterisk-0.7.2/Makefile 2004-02-21 15:08:56.808366286 -0700 |
| 61 | @@ -317,7 +317,7 @@ |
| 62 | mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ |
| 63 | rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ |
| 64 | fi |
| 65 | - ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm |
| 66 | + ln -s ../../../spool/asterisk/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm |
| 67 | rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so |
| 68 | rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so |
| 69 | rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so |
| 70 | @@ -329,8 +329,8 @@ |
| 71 | mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv |
| 72 | mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys |
| 73 | install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys |
| 74 | - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/vm . ) |
| 75 | - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) |
| 76 | + ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s ../../../spool/asterisk/vm . ) |
| 77 | + ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s ../../../spool/asterisk/voicemail . ) |
| 78 | @echo " +---- Asterisk Installation Complete -------+" |
| 79 | @echo " + +" |
| 80 | @echo " + YOU MUST READ THE SECURITY DOCUMENT +" |
projects / packages / asterisk.git / blame