diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-06-13 14:31:24 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-06-13 14:31:24 +0000 |
| commit | 2362ee573895eb6e1073d09542f3e04954ac11be (patch) | |
| tree | cffe4109e379cb1537f373e3c76436d7e5611b1d | |
| parent | 019010e611ad56871ed0ad436dc0b3eaf026f2d7 (diff) | |
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
........
Merged revisions 368853 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -497,7 +497,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" \ @@ -510,7 +510,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 |