also include /etc/asterisk.makeopts, but have file in home directory override

it if present

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

diff --git a/Makefile b/Makefile
index 1d985edb6921d10208e6101937ee9f8d4bd153f0..336b5ea10ccab6cf8a17a0c4daaa532cd60e9f4f 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,12 @@ HTTP_CGIDIR=/var/www/cgi-bin
 # If the file .asterisk.makeopts is present in your home directory, you can
 # include all of your favorite Makefile options so that every time you download
 # a new version of Asterisk, you don't have to edit the makefile to set them. 
+# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# by the file in your home directory.
+
+ifneq ($(wildcard /etc/asterisk.makeopts),)
+include /etc/asterisk.makeopts
+endif
 
 ifneq ($(wildcard ~/.asterisk.makeopts),)
 include ~/.asterisk.makeopts