finalise 2.1.2

[authbind.git] / Makefile

diff --git a/Makefile b/Makefile
index 18a092696ae06b9d8351debabcfa9963da3766b7..37a8673de9aa8779abe22f38f3f939bd4f8bc9e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
-#
-# $Id$
 
 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
@@ -30,39 +29,49 @@ man8_dir=$(man_dir)/man8
 
 etc_dir=/etc/authbind
 
+INSTALL_FILE   ?= install -o root -g root -m 644 
+INSTALL_PROGRAM ?= install -o root -g root -m 755 -s
+INSTALL_DIR    ?= install -o root -g root -m 755 -d
+STRIP          ?= strip
+
 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
 
 all:                   $(TARGETS)
 
 install:               $(TARGETS)
-               install -o root -g root -m 755 -d $(lib_dir) $(man1_dir) $(man8_dir)
-               install -o root -g root -m 755 -s authbind $(bin_dir)/.
-               install -o root -g root -m 755 $(LIBTARGET) $(lib_dir)/.
-               strip --strip-unneeded $(lib_dir)/$(LIBTARGET)
+               $(INSTALL_DIR) $(lib_dir) $(man1_dir) $(man8_dir)
+               $(INSTALL_PROGRAM) $(BINTARGETS) $(bin_dir)/.
+               $(INSTALL_FILE) $(LIBTARGET) $(lib_dir)/.
+               $(STRIP) --strip-unneeded $(lib_dir)/$(LIBTARGET)
                ln -sf $(LIBTARGET) $(lib_dir)/$(LIBCANON)
-               install -o root -g root -m 4755 -s helper $(lib_dir)/.
-               install -o root -g root -m 755 -d $(etc_dir) \
+               $(INSTALL_PROGRAM) $(HELPER) $(libexec_dir)/.
+               chmod u+s $(libexec_dir)/$(HELPER)
+               $(INSTALL_DIR) $(etc_dir) \
                        $(etc_dir)/byport $(etc_dir)/byaddr $(etc_dir)/byuid
 
 install_man:           $(MANPAGES_1) $(MANPAGES_8)
-               install -o root -g root -m 644 $(MANPAGES_1) $(man1_dir)/.
-               install -o root -g root -m 644 $(MANPAGES_8) $(man8_dir)/.
+               $(INSTALL_FILE) $(MANPAGES_1) $(man1_dir)/.
+               $(INSTALL_FILE) $(MANPAGES_8) $(man8_dir)/.
 
 libauthbind.o:         libauthbind.c authbind.h
                $(CC) -D_REENTRANT $(CFLAGS) $(CPPFLAGS) -c -o $@ -fPIC $<
@@ -73,7 +82,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