[asterisk-commits] mjordan: branch 10 r368853 - in /branches/10: ./ Makefile

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jun 13 09:30:34 2012
New Revision: 368853

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368853
Log:
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

Modified:
    branches/10/   (props changed)
    branches/10/Makefile

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/10/Makefile?view=diff&rev=368853&r1=368852&r2=368853
==============================================================================
--- branches/10/Makefile (original)
+++ branches/10/Makefile Wed Jun 13 09:30:34 2012
@@ -476,7 +476,7 @@
 
 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:
 	@for i in $(INSTALLDIRS); do \
-		if [ ! -d "$(DESTDIR)$${i}" ]; then \
+		if [ ! -z "$${i}" -a ! -d "$(DESTDIR)$${i}" ]; then \
 			$(INSTALL) -d "$(DESTDIR)$${i}"; \
 		fi; \
 	done