diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/libpam-radius-auth.install | 5 | ||||
| -rwxr-xr-x | debian/rules | 14 |
5 files changed, 15 insertions, 20 deletions
@@ -59,6 +59,9 @@ src/radius_shell.o: src/radius_shell.c #pam_radius_auth.so: pam_radius_auth.o md5.o # ld -shared pam_radius_auth.o md5.o -L/usr/freeware/lib32 -lpam -lc -o pam_radius_auth.so +# set to x86_64-linux-gnu, arm-linux-gnueabi, etc. by packaging tools +# If not set, just install directly to /lib +LIBDIR=/lib/${DEB_TARGET_GNU_TYPE} ###################################################################### # @@ -72,7 +75,8 @@ src/radius_shell.o: src/radius_shell.c # # gcc -shared pam_radius_auth.o md5.o -lpam -lc -o pam_radius_auth.so # -pam_radius_auth.so: src/pam_radius_auth.o src/support.o src/md5.o +PAM_MODULE=pam_radius_auth.so +$(PAM_MODULE): src/pam_radius_auth.o src/support.o src/md5.o $(CC) $(LDFLAGS) $(LDSHFLAGS) $^ $(LDLIBS) $(LIBLIBS) -o $@ radius_shell: src/radius_shell.o @@ -95,3 +99,9 @@ dist: .PHONY: clean clean: @rm -f *~ *.so *.o src/*.o src/*~ radius_shell + +install: all + install -m 0755 -d $(DESTDIR)$(LIBDIR)/security $(DESTDIR)/etc + install -m 0644 $(PAM_MODULE) $(DESTDIR)$(LIBDIR)/security + install -m 0600 pam_radius_auth.conf $(DESTDIR)/etc + diff --git a/debian/compat b/debian/compat index ec63514..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +12 diff --git a/debian/control b/debian/control index ce22bf9..ab7fa1c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: dev-support <dev-support@cumulusnetworks.com> Section: libs Priority: extra Standards-Version: 3.9.6 -Build-Depends: libpam0g-dev | libpam-dev, debhelper (>= 9~), libaudit-dev, libcap-dev +Build-Depends: libpam0g-dev | libpam-dev, debhelper (>= 12), libaudit-dev, libcap-dev Package: libpam-radius-auth Architecture: any diff --git a/debian/libpam-radius-auth.install b/debian/libpam-radius-auth.install index 128092b..4bffe5e 100644 --- a/debian/libpam-radius-auth.install +++ b/debian/libpam-radius-auth.install @@ -1,3 +1,2 @@ -pam_radius_auth.so lib/security -pam_radius_auth.conf etc -index.html usr/share/doc/libpam-radius-auth/html +lib +etc diff --git a/debian/rules b/debian/rules index 7066806..45209fb 100755 --- a/debian/rules +++ b/debian/rules @@ -17,17 +17,3 @@ export CFLAGS %: dh $@ --with autoreconf - -# all the installing is here, not in Makefile. -# The configuration file with the share secrets needs to be 600 -override_dh_install: - dh_install -v --sourcedir=. --package=libpam-radius-auth - dh_install -v --sourcedir=. --package=radius-shell - chmod 600 debian/*/${PAM_CONF_FILE} - chmod 750 debian/*/sbin/radius_shell - -override_dh_fixperms: - dh_fixperms --exclude ${PAM_CONF_FILE} - -override_dh_installchangelogs: - dh_installchangelogs Changelog |