Kerry,
The lines that begin with a "+" sign mean that they are to be added to
the Makefile. The other lines above and below it should already be in
the Makefile and are provided to assist you with understanding where
the lines should be inserted. So, you will want to manually add all of
the lines with the "+" sign in front of them. The patch process will
fail if it is unable to exactly match the surrounding lines to
determine where to put the new lines (or in some cases to change
existing lines). You just need to make the changes manually.
Derrick
Kerry Zielke wrote:
***************
*** 41,50 ****
APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo
"app_zapras.so app_meetme.so app_flash.so a
pp_zapbarge.so app_zapscan.so" ; fi)
APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo
"app_zapras.so app_meetme.so app_flash.so a
pp_zapbarge.so app_zapscan.so" ; fi)
APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo
"app_osplookup.so" ; fi)
CFLAGS+=-fPIC
ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
CFLAGS+=-DUSEPOSTGRESVM
endif
--- 41,53 ----
APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo
"app_zapras.so app_meetme.so app_flash.so a
pp_zapbarge.so app_zapscan.so" ; fi)
APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo
"app_zapras.so app_meetme.so app_flash.so a
pp_zapbarge.so app_zapscan.so" ; fi)
APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo
"app_osplookup.so" ; fi)
I am trying to install SpanDSP and have encountered problems in the step
where I have to patch the Makefile with a patch.
It didn't execute cleanly and generated a Makefile.rej file as shown below.
In reviewing previous correspondance about this problem it wasn't clear on
what the solution is.
Can someone provide me with additional information on how to resolve this
problem?
Regards,
Kerry
+ APPS+=$(shell if [ -f /usr/include/spandsp.h ]; then echo "app_rxfax.so
app_txfax.so" ; fi)
+ APPS+=$(shell if [ -f /usr/local/include/spandsp.h ]; then echo
"app_rxfax.so app_txfax.so" ; fi)
+
CFLAGS+=-fPIC
ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
CFLAGS+=-DUSEPOSTGRESVM
endif
***************
*** 66,75 ****
install: all
for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR)
; done
rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
app_voicemail.so : app_voicemail.o
ifeq ($(USE_MYSQL_VM_INTERFACE),1)
$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient
-lz
else
ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
--- 69,84 ----
install: all
for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR)
; done
rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
+ app_rxfax.so : app_rxfax.o
+ $(CC) $(SOLINK) -o $@ $< -lspandsp -ltiff
+
+ app_txfax.so : app_txfax.o
+ $(CC) $(SOLINK) -o $@ $< -lspandsp -ltiff
+
app_voicemail.so : app_voicemail.o
ifeq ($(USE_MYSQL_VM_INTERFACE),1)
$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient
-lz
else
ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
_______________________________________________
Asterisk-Users mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-users
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-users
|
_______________________________________________
Asterisk-Users mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-users
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-users
