[Asterisk-cvs] asterisk Makefile,1.211,1.212

[kpfleming]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv9738

Modified Files:
	Makefile 
Log Message:
allow some more paths to be overridden on the command line (issue #5292)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- Makefile	29 Sep 2005 02:38:24 -0000	1.211
+++ Makefile	29 Sep 2005 04:06:15 -0000	1.212
@@ -77,7 +77,7 @@
 
 # Where to install asterisk after compiling
 # Default -> leave empty
-INSTALL_PREFIX=
+INSTALL_PREFIX?=
 
 # Staging directory
 # Files are copied here temporarily during the install process
@@ -209,7 +209,7 @@
   M4=/usr/local/bin/m4
 endif
 
-INCLUDE=-Iinclude -I../include
+INCLUDE+=-Iinclude -I../include
 ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 ASTCFLAGS+=$(OPTIMIZE)
 
@@ -312,7 +312,7 @@
 endif
 
 ifeq (${OSARCH},Linux)
-  LIBS=-ldl -lpthread -lncurses -lm -lresolv  #-lnjamd
+  LIBS+=-ldl -lpthread -lncurses -lm -lresolv  #-lnjamd
 else
   LIBS+=-lncurses -lm
 endif
@@ -338,7 +338,7 @@
 endif
 
 ifeq (${OSARCH},OpenBSD)
-  LIBS=-lcrypto -lpthread -lm -lncurses
+  LIBS+=-lcrypto -lpthread -lm -lncurses
 endif
 
 ifeq (${OSARCH},SunOS)
@@ -488,7 +488,7 @@
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig
+	if test $$(id -u) = 0; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \