|
|
cd0ffae |
diff -rupN cntlm-0.92.3/Makefile cntlm-0.92.3-new/Makefile
|
|
|
cd0ffae |
--- cntlm-0.92.3/Makefile 2012-03-02 14:18:35.000000000 +0100
|
|
|
c26983f |
+++ cntlm-0.92.3-new/Makefile 2013-08-26 22:53:33.689327246 +0200
|
|
|
cd0ffae |
@@ -15,10 +15,8 @@ MANDIR=$(DESTDIR)/usr/share/man
|
|
|
cd0ffae |
NAME=cntlm
|
|
|
cd0ffae |
CC=gcc
|
|
|
cd0ffae |
VER=`cat VERSION`
|
|
|
cd0ffae |
-CFLAGS+=$(FLAGS) -std=c99 -Wall -Wno-unused-but-set-variable -pedantic -O3 -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"`cat VERSION`\"
|
|
|
cd0ffae |
-OS=$(shell uname -s)
|
|
|
cd0ffae |
-OSLDFLAGS=$(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl")
|
|
|
cd0ffae |
-LDFLAGS:=-lpthread $(OSLDFLAGS)
|
|
|
cd0ffae |
+override CFLAGS += -std=c99 -pedantic -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"`cat VERSION`\"
|
|
|
cd0ffae |
+override LDFLAGS += -lpthread
|
|
|
cd0ffae |
|
|
|
cd0ffae |
ifeq ($(findstring CYGWIN,$(OS)),)
|
|
|
cd0ffae |
OBJS=utils.o ntlm.o xcrypt.o config.o socket.o acl.o auth.o http.o forward.o direct.o scanner.o pages.o main.o
|
|
|
c26983f |
@@ -45,16 +43,16 @@ main.o: main.c
|
|
|
c26983f |
install: $(NAME)
|
|
|
c26983f |
# Special handling for install(1)
|
|
|
c26983f |
if [ "`uname -s`" = "AIX" ]; then \
|
|
|
c26983f |
- install -M 755 -S -f $(BINDIR) $(NAME); \
|
|
|
c26983f |
+ install -M 755 -f $(BINDIR) $(NAME); \
|
|
|
c26983f |
install -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \
|
|
|
c26983f |
install -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \
|
|
|
c26983f |
elif [ "`uname -s`" = "Darwin" ]; then \
|
|
|
c26983f |
- install -d -m 755 -s $(NAME) $(BINDIR)/$(NAME); \
|
|
|
c26983f |
+ install -d -m 755 $(NAME) $(BINDIR)/$(NAME); \
|
|
|
c26983f |
install -d -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \
|
|
|
c26983f |
[ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \
|
|
|
c26983f |
|| install -d -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \
|
|
|
c26983f |
else \
|
|
|
c26983f |
- install -D -m 755 -s $(NAME) $(BINDIR)/$(NAME); \
|
|
|
c26983f |
+ install -D -m 755 $(NAME) $(BINDIR)/$(NAME); \
|
|
|
c26983f |
install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \
|
|
|
c26983f |
[ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \
|
|
|
c26983f |
|| install -D -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \
|