From 8cb2ab13c1911c89c88953cfb07ce6e1b404066b Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 29 Apr 2006 11:40:04 +0000 Subject: do installation in subdirs as a separate target (so external modules can use the Makefile more easily) generate final messages -after- running any post-install script that may be present git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@23305 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ae3e45900..00a474154 100644 --- a/Makefile +++ b/Makefile @@ -642,7 +642,6 @@ bininstall: all cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ fi - for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) if [ -n "$(OLDHEADERS)" ]; then \ @@ -667,28 +666,9 @@ bininstall: all echo "You need to do cvs update -d not just cvs update" ; \ fi if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi - @echo " +---- Asterisk Installation Complete -------+" - @echo " + +" - @echo " + YOU MUST READ THE SECURITY DOCUMENT +" - @echo " + +" - @echo " + Asterisk has successfully been installed. +" - @echo " + If you would like to install the sample +" - @echo " + configuration files (overwriting any +" - @echo " + existing config files), run: +" - @echo " + +" - @echo " + $(MAKE) samples +" - @echo " + +" - @echo " +----------------- or ---------------------+" - @echo " + +" - @echo " + You can go ahead and install the asterisk +" - @echo " + program documentation now or later run: +" - @echo " + +" - @echo " + $(MAKE) progdocs +" - @echo " + +" - @echo " + **Note** This requires that you have +" - @echo " + doxygen installed on your local system +" - @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck + +install-subdirs: + for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done NEWMODS=$(notdir $(wildcard */*.so)) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) @@ -711,10 +691,32 @@ oldmodcheck: echo " WARNING WARNING WARNING" ;\ fi -install: all datafiles bininstall +install: all datafiles bininstall install-subdirs @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi + @echo " +---- Asterisk Installation Complete -------+" + @echo " + +" + @echo " + YOU MUST READ THE SECURITY DOCUMENT +" + @echo " + +" + @echo " + Asterisk has successfully been installed. +" + @echo " + If you would like to install the sample +" + @echo " + configuration files (overwriting any +" + @echo " + existing config files), run: +" + @echo " + +" + @echo " + $(MAKE) samples +" + @echo " + +" + @echo " +----------------- or ---------------------+" + @echo " + +" + @echo " + You can go ahead and install the asterisk +" + @echo " + program documentation now or later run: +" + @echo " + +" + @echo " + $(MAKE) progdocs +" + @echo " + +" + @echo " + **Note** This requires that you have +" + @echo " + doxygen installed on your local system +" + @echo " +-------------------------------------------+" + @$(MAKE) -s oldmodcheck upgrade: all bininstall -- cgit v1.2.3