From: ian <ian>
Date: Fri, 2 Apr 2004 18:54:27 +0000 (+0000)
Subject: @@ -7,6 +7,9 @@
X-Git-Tag: debian_version_1_2_0~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=authbind.git;a=commitdiff_plain;h=59d14c88d280ffc962ee93e535ae87567316c544

@@ -7,6 +7,9 @@
     programs.  See also Bug#186439.
+  * New make variables for improved portability and customisation of
+    locations: LIBS, libexec_dir, HELPER.
+  * make clean removes *.core too.
---

diff --git a/Makefile b/Makefile
index 1d9a011..c034d2f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ prefix=/usr/local
 
 bin_dir=$(prefix)/bin
 lib_dir=$(prefix)/lib/authbind
+libexec_dir=$(lib_dir)
 
 share_dir=$(prefix)/share
 man_dir=$(share_dir)/man
@@ -36,20 +37,23 @@ INSTALL_DIR=install -o root -g root -m 755 -d
 
 OPTIMISE=	-O2
 LDFLAGS=	-g
+LIBS=		-ldl -lc
 CFLAGS=		-g $(OPTIMISE) \
 		-Wall -Wwrite-strings -Wpointer-arith -Wimplicit \
 		-Wnested-externs -Wmissing-prototypes -Wstrict-prototypes
 CPPFLAGS=	-DMAJOR_VER='"$(MAJOR)"' -DMINOR_VER='"$(MINOR)"' \
 		-DLIBAUTHBIND='"$(lib_dir)/$(LIBCANON)"' \
-		-DHELPER='"$(lib_dir)/helper"' -DCONFIGDIR='"$(etc_dir)"' \
+		-DHELPER='"$(libexec_dir)/$(HELPER)"' -DCONFIGDIR='"$(etc_dir)"' \
 		-D_GNU_SOURCE
 
 MAJOR=1
 MINOR=0
 LIBCANON=	libauthbind.so.$(MAJOR)
 LIBTARGET=	$(LIBCANON).$(MINOR)
+BINTARGETS=	authbind
+HELPER=		helper
 
-TARGETS=		authbind helper $(LIBTARGET)
+TARGETS=		$(BINTARGETS) $(HELPER) $(LIBTARGET)
 MANPAGES_1=		authbind.1
 MANPAGES_8=		authbind-helper.8
 
@@ -57,12 +61,12 @@ all:			$(TARGETS)
 
 install:		$(TARGETS)
 		$(INSTALL_DIR) $(lib_dir) $(man1_dir) $(man8_dir)
-		$(INSTALL_PROGRAM) authbind $(bin_dir)/.
+		$(INSTALL_PROGRAM) $(BINTARGETS) $(bin_dir)/.
 		$(INSTALL_FILE) $(LIBTARGET) $(lib_dir)/.
 		strip --strip-unneeded $(lib_dir)/$(LIBTARGET)
 		ln -sf $(LIBTARGET) $(lib_dir)/$(LIBCANON)
-		$(INSTALL_PROGRAM) helper $(lib_dir)/.
-		chmod u+s $(lib_dir)/helper
+		$(INSTALL_PROGRAM) $(HELPER) $(libexec_dir)/.
+		chmod u+s $(libexec_dir)/$(HELPER)
 		$(INSTALL_DIR) $(etc_dir) \
 			$(etc_dir)/byport $(etc_dir)/byaddr $(etc_dir)/byuid
 
@@ -79,7 +83,8 @@ helper:			helper.o
 helper.o authbind.o:	authbind.h
 
 $(LIBTARGET):		libauthbind.o
-		ld -shared -soname $(LIBCANON) -o $@ $< -ldl -lc
+		ld -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
 
 clean distclean:
-		rm -f $(TARGETS) *.o *~ ./#*# *.bak *.new core libauthbind.so*
+		rm -f $(TARGETS) *.o *~ ./#*# *.bak *.new core
+		rm -f libauthbind.so* *.core
diff --git a/debian/changelog b/debian/changelog
index 438c022..e20e17a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ authbind (1.1.6) unstable; urgency=low
     programs.  See also Bug#186439.
   * Make sure we don't try to encode errno's >127 in a status code.
   * Do not Build-Depends: libc6-dev (it's build-essential).
+  * New make variables for improved portability and customisation of
+    locations: LIBS, libexec_dir, HELPER.
+  * make clean removes *.core too.
 
  --
 
diff --git a/libauthbind.c b/libauthbind.c
index a16f835..99a7f3f 100644
--- a/libauthbind.c
+++ b/libauthbind.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <signal.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/wait.h>