With manpage, etc.

diff --git a/Makefile b/Makefile
index 12aae95198406832f2d694cf0fdffe6f192911f8..cd9e8780244570ef9320ebb978ca746eb6cadd7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,20 +19,24 @@
 # $Id$
 
 prefix=/usr/local
 # $Id$
 
 prefix=/usr/local

-share_dir=$(prefix)/share
-etc_dir=/etc/authbind
+
+bin_dir=$(prefix)/bin

 lib_dir=$(prefix)/lib/authbind
 lib_dir=$(prefix)/lib/authbind

+
+share_dir=$(prefix)/share

 man_dir=$(share_dir)/man
 man1_dir=$(man_dir)/man1
 man8_dir=$(man_dir)/man8
 
 man_dir=$(share_dir)/man
 man1_dir=$(man_dir)/man1
 man8_dir=$(man_dir)/man8
 

+etc_dir=/etc/authbind
+

 OPTIMISE=      -O2
 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)"' \
 OPTIMISE=      -O2
 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='"$(prefix)/helper"' -DCONFIGDIR='"$(etc_dir)"'
+               -DHELPER='"$(lib_dir)/helper"' -DCONFIGDIR='"$(etc_dir)"'

 
 MAJOR=1
 MINOR=0
 
 MAJOR=1
 MINOR=0


@@ -40,18 +44,18 @@ LIBCANON=   libauthbind.so.$(MAJOR)
 LIBTARGET=     $(LIBCANON).$(MINOR)
 
 TARGETS=               authbind helper $(LIBTARGET)
 LIBTARGET=     $(LIBCANON).$(MINOR)
 
 TARGETS=               authbind helper $(LIBTARGET)

-MANPAGES_1=            authbind
-MANPAGES_8=            authbind-helper
+MANPAGES_1=            authbind.1
+MANPAGES_8=            authbind-helper.8

 
 all:                   $(TARGETS)
 
 install:               $(TARGETS)
 
 all:                   $(TARGETS)
 
 install:               $(TARGETS)

-               install -o root -g root -m 755 -d $(lib_dir) $(man_dir)
-               install -o root -g root -m 755 authbind $(bin_dir)/.
+               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)
                ln -s $(LIBTARGET) $(lib_dir)/$(LIBCANON)
                install -o root -g root -m 755 $(LIBTARGET) $(lib_dir)/.
                strip --strip-unneeded $(lib_dir)/$(LIBTARGET)
                ln -s $(LIBTARGET) $(lib_dir)/$(LIBCANON)

-               install -o root -g root -m 4755 helper $(lib_dir)/.
+               install -o root -g root -m 4755 -s helper $(lib_dir)/.

                install -o root -g root -m 755 -d $(etc_dir) \
                        $(etc_dir)/byport $(etc_dir)/byaddr $(etc_dir)/byuid
 
                install -o root -g root -m 755 -d $(etc_dir) \
                        $(etc_dir)/byport $(etc_dir)/byaddr $(etc_dir)/byuid
 

diff --git a/debian/rules b/debian/rules
index 5a3061607273e253b632f50ecc4d20fccc29e10a..a951d23f607b3ee51b4edc3c9c2ba91ab919008e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,12 @@ minor=0
 arch = $(shell dpkg --print-architecture)
 
 build: 
 arch = $(shell dpkg --print-architecture)
 
 build: 

-       $(MAKE)
+       $(MAKE) prefix=/usr

 
 clean: 
 
 clean: 

-       rm -rf debian/{files,substvars,tmp} build 

        $(MAKE) distclean
        $(MAKE) distclean

+       rm -rf debian/{files,substvars,tmp} build
+       rm -f debian/*~ debian/#*# debian/core debian/*.bak

 
 binary-indep:   checkroot build
         $(checkdir)
 
 binary-indep:   checkroot build
         $(checkdir)


@@ -46,9 +47,10 @@ udp=debian/tmp/usr/doc/$(package)
 
 binary-arch:   checkroot build
        rm -rf debian/tmp
 
 binary-arch:   checkroot build
        rm -rf debian/tmp

-       install -d -g root -m 755 -o root debian/tmp/DEBIAN $udp \
+       install -d -g root -m 755 -o root debian/tmp/DEBIAN $(udp) \

                debian/tmp/usr/{bin,lib/$(package),man}
                debian/tmp/usr/{bin,lib/$(package),man}

-       $(MAKE) prefix=debian/tmp/usr install install_man
+       $(MAKE) prefix=debian/tmp/usr etc_dir=debian/tmp/etc/authbind \
+               man_dir=debian/tmp/usr/man  install install_man

        install -g root -o root -m 644 debian/copyright $(udp)/.
        install -g root -o root -m 644 debian/changelog $(udp)/changelog.Debian
        gzip -9 debian/tmp/usr/man/man*/* $(udp)/*
        install -g root -o root -m 644 debian/copyright $(udp)/.
        install -g root -o root -m 644 debian/changelog $(udp)/changelog.Debian
        gzip -9 debian/tmp/usr/man/man*/* $(udp)/*


@@ -62,8 +64,6 @@ endif
        dpkg-gencontrol
        chown -R root.root debian/tmp
        chmod -R g-ws debian/tmp
        dpkg-gencontrol
        chown -R root.root debian/tmp
        chmod -R g-ws debian/tmp

-       #/bin/bash #-c "ls debian/tmp"
-       #bash -c "dpkg --build debian/tmp .."

        dpkg --build debian/tmp ..
 
 binary:         binary-indep binary-arch
        dpkg --build debian/tmp ..
 
 binary:         binary-indep binary-arch