From: Matthew Jordan <mjordan@digium.com>
Date: Wed, 13 Jun 2012 14:30:34 +0000 (+0000)
Subject: Do not install empty directories; add ASTLIBDIR
X-Git-Tag: 10.7.0-rc1~3^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d8e3bc608adc5ed0ae845098bf842b9d1bb4ec5;p=thirdparty%2Fasterisk.git

Do not install empty directories; add ASTLIBDIR

r368830 modified the installation script to only create a directory if that
directory does not exist.  If some directory variable was empty, it would attempt
to create the empty location.  It also failed to create the ASTLIBDIR directory.
This patch fixes it such that the correct directories are made and only created if
a value specifying them actually exists.
........

Merged revisions 368852 from http://svn.asterisk.org/svn/asterisk/branches/1.8


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

diff --git a/Makefile b/Makefile
index fc8ac67956..f302ce6880 100644
--- a/Makefile
+++ b/Makefile
@@ -476,7 +476,7 @@ update:
 
 NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
 OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
-INSTALLDIRS="$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
+INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
 	"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
 	"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
 	"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
@@ -489,7 +489,7 @@ INSTALLDIRS="$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
 
 installdirs:
 	@for i in $(INSTALLDIRS); do \
-		if [ ! -d "$(DESTDIR)$${i}" ]; then \
+		if [ ! -z "$${i}" -a ! -d "$(DESTDIR)$${i}" ]; then \
 			$(INSTALL) -d "$(DESTDIR)$${i}"; \
 		fi; \
 	done