Merged revisions 114278 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 18 Apr 2008 20:01:47 +0000 (20:01 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 18 Apr 2008 20:01:47 +0000 (20:01 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114278 | russell | 2008-04-18 15:01:09 -0500 (Fri, 18 Apr 2008) | 2 lines

ensure directories are created before we try to install stuff into them

........

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

Makefile

index ef959dd..1139160 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -498,7 +498,7 @@ update:
 NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
-bininstall: _all $(SUBDIRS_INSTALL)
+installdirs:
        mkdir -p $(DESTDIR)$(MODULES_DIR)
        mkdir -p $(DESTDIR)$(ASTSBINDIR)
        mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -510,6 +510,8 @@ bininstall: _all $(SUBDIRS_INSTALL)
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+
+bininstall: _all installdirs $(SUBDIRS_INSTALL)
        $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
        $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
        $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -867,4 +869,4 @@ pdf: asterisk.pdf
 asterisk.pdf:
        $(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c include/asterisk/version.h
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c include/asterisk/version.h installdirs