From d0989825944986e37e19872f454bf9bace288176 Mon Sep 17 00:00:00 2001 From: Anand Kumria Date: Wed, 5 Apr 2017 15:22:31 +0100 Subject: [PATCH 1/2] Add a basic .gitignore file --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..decb99ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.o +config/* +cntlm +configure-stamp From b8bc4b27ef0d402a0975e913e996fc673d81b4a8 Mon Sep 17 00:00:00 2001 From: Anand Kumria Date: Wed, 5 Apr 2017 15:46:17 +0100 Subject: [PATCH 2/2] Create the directories first and then copy the files. Mac OS X 10.11 has an install where '-d' only creates directories; it does *not* copy files. Split the install into two sequences to get things working properly. --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 71894aa3..bfa89da2 100644 --- a/Makefile +++ b/Makefile @@ -62,10 +62,11 @@ install: $(NAME) install -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \ install -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \ elif [ "`uname -s`" = "Darwin" ]; then \ - install -d -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ - install -d -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \ + install -d $(BINDIR) $(MANDIR)/man1/ $(SYSCONFDIR); \ + install -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ + install -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \ [ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \ - || install -d -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ + || install -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ else \ install -D -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \