Fix adsi target in main Makefile and check a variable properly (issue #7369 reported by casper)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Joshua Colp 20 years ago
parent 0073f0de9e
commit eb5af4b1f3

@ -145,13 +145,13 @@ ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
OPTIMIZE+=-O6 OPTIMIZE+=-O6
else else
# Stack backtraces, while useful for debugging, are incompatible with optimizations # Stack backtraces, while useful for debugging, are incompatible with optimizations
ifeq (${OSARCH},Linux) ifeq ($(OSARCH),Linux)
CFLAGS+=-DSTACK_BACKTRACES CFLAGS+=-DSTACK_BACKTRACES
endif endif
endif endif
else else
# Stack backtraces, while useful for debugging, are incompatible with optimizations # Stack backtraces, while useful for debugging, are incompatible with optimizations
ifeq (${OSARCH},Linux) ifeq ($(OSARCH),Linux)
CFLAGS+=-DSTACK_BACKTRACES CFLAGS+=-DSTACK_BACKTRACES
endif endif
endif endif
@ -668,7 +668,7 @@ upgrade: all bininstall
adsi: adsi:
mkdir -p $(DESTDIR)$(ASTETCDIR) mkdir -p $(DESTDIR)$(ASTETCDIR)
for x in configs/*.adsi; do \ for x in configs/*.adsi; do \
if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
fi ; \ fi ; \
done done

Loading…
Cancel
Save