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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34496 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index fc74bb1..6959e21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,13 +145,13 @@ ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
 OPTIMIZE+=-O6
   else
     # Stack backtraces, while useful for debugging, are incompatible with optimizations
-    ifeq (${OSARCH},Linux)
+    ifeq ($(OSARCH),Linux)
       CFLAGS+=-DSTACK_BACKTRACES
     endif
   endif
 else
   # Stack backtraces, while useful for debugging, are incompatible with optimizations
-  ifeq (${OSARCH},Linux)
+  ifeq ($(OSARCH),Linux)
     CFLAGS+=-DSTACK_BACKTRACES
   endif
 endif
@@ -668,7 +668,7 @@ upgrade: all bininstall
 adsi:
        mkdir -p $(DESTDIR)$(ASTETCDIR)
        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` ; \
                fi ; \
        done