Merged revisions 23305 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Sat, 29 Apr 2006 11:42:31 +0000 (11:42 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sat, 29 Apr 2006 11:42:31 +0000 (11:42 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r23305 | kpfleming | 2006-04-29 06:40:04 -0500 (Sat, 29 Apr 2006) | 3 lines

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: https://origsvn.digium.com/svn/asterisk/trunk@23306 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 6ebc39e..b6aab06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -683,7 +683,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 \
@@ -708,28 +707,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)))
@@ -752,10 +732,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