kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 05:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43524 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43524 | kpfleming | 2006-09-22 18:44:47 -0500 (Fri, 22 Sep 2006) | 2 lines

don't output the 'build complete' message when the target being run is already going to do an installation

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-09-22 23:45:14 +00:00
parent 7882fc5a25
commit e796af37f1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -231,7 +231,7 @@ else
HAVEDOT=no HAVEDOT=no
endif endif
all: cleantest $(SUBDIRS) all: _all
@echo " +--------- Asterisk Build Complete ---------+" @echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +" @echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +" @echo " + can be installed by running: +"
@@ -239,6 +239,8 @@ all: cleantest $(SUBDIRS)
@echo " + make install +" @echo " + make install +"
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
makeopts: configure makeopts: configure
@echo "****" @echo "****"
@echo "**** The configure script must be executed before running 'make'." @echo "**** The configure script must be executed before running 'make'."
@@ -329,7 +331,7 @@ distclean: clean
rm -rf doc/api rm -rf doc/api
rm -f build_tools/menuselect-deps rm -f build_tools/menuselect-deps
datafiles: all datafiles: _all
if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala # Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be # webvoicemail? There are portions here that *could* be customized but might also be
@@ -363,7 +365,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
bininstall: all bininstall: _all
mkdir -p $(DESTDIR)$(MODULES_DIR) mkdir -p $(DESTDIR)$(MODULES_DIR)
mkdir -p $(DESTDIR)$(ASTSBINDIR) mkdir -p $(DESTDIR)$(ASTSBINDIR)
mkdir -p $(DESTDIR)$(ASTETCDIR) mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -427,7 +429,7 @@ oldmodcheck:
echo " WARNING WARNING WARNING" ;\ echo " WARNING WARNING WARNING" ;\
fi fi
install: all datafiles bininstall $(SUBDIRS_INSTALL) install: datafiles bininstall $(SUBDIRS_INSTALL)
@if [ -x /usr/sbin/asterisk-post-install ]; then \ @if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi fi
@@ -454,7 +456,7 @@ install: all datafiles bininstall $(SUBDIRS_INSTALL)
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck @$(MAKE) -s oldmodcheck
upgrade: all bininstall upgrade: bininstall
adsi: adsi:
mkdir -p $(DESTDIR)$(ASTETCDIR) mkdir -p $(DESTDIR)$(ASTETCDIR)