diff -Naur asterisk.old/Makefile asterisk.new/Makefile --- asterisk.old/Makefile 2005-09-27 09:19:56.000000000 +0200 +++ asterisk.new/Makefile 2005-09-27 13:49:19.000000000 +0200 @@ -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 \