dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 43524 via svnmerge from 

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: http://svn.digium.com/svn/asterisk/trunk@43525 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-09-22 23:45:14 +00:00
parent 4f2f52c71e
commit cdc484c1df
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -231,7 +231,7 @@ else
HAVEDOT=no
endif
all: cleantest $(SUBDIRS)
all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@ -239,6 +239,8 @@ all: cleantest $(SUBDIRS)
@echo " + make install +"
@echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
@echo "**** The configure script must be executed before running 'make'."
@ -329,7 +331,7 @@ distclean: clean
rm -rf doc/api
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
# 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
@ -363,7 +365,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
bininstall: all
bininstall: _all
mkdir -p $(DESTDIR)$(MODULES_DIR)
mkdir -p $(DESTDIR)$(ASTSBINDIR)
mkdir -p $(DESTDIR)$(ASTETCDIR)
@ -427,7 +429,7 @@ oldmodcheck:
echo " WARNING WARNING WARNING" ;\
fi
install: all datafiles bininstall $(SUBDIRS_INSTALL)
install: datafiles bininstall $(SUBDIRS_INSTALL)
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@ -454,7 +456,7 @@ install: all datafiles bininstall $(SUBDIRS_INSTALL)
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
upgrade: all bininstall
upgrade: bininstall
adsi:
mkdir -p $(DESTDIR)$(ASTETCDIR)