Fix various issues

diff --git a/configure.in b/configure.in
index 6ef8170..e10f173 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1025,11 +1025,6 @@ if test "x$developer" = "xyes"; then
   if test "x$EXPERIMENTAL" != "xno"; then
     EXPERIMENTAL=yes
   fi
-  
-  dnl append the current git hash onto the version string
-  if test "x$GIT" = "xyes"; then
-       RADIUSD_VERSION_COMMIT=`git log --pretty=format:'%h' -n 1`
-  fi
 else
   devflags=""
   CFLAGS="$CFLAGS -DNDEBUG"
@@ -1037,6 +1032,11 @@ else
   AC_MSG_RESULT(no.)
 fi
 
+dnl append the current git hash onto the version string
+if test "x$GIT" = "xyes"; then
+  RADIUSD_VERSION_COMMIT=`test -f .git && git log --pretty=format:'%h' -n 1`
+fi
+
 FR_TLS
 
 dnl #############################################################

diff --git a/debian/rules b/debian/rules
index 730747a..9f6f4a6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,10 @@ export DH_VERBOSE=1
 
 .NOTPARALLEL:
 
-SHELL           =/bin/bash
+SHELL           = /bin/bash
 
 package         = freeradius
-freeradius_dir  = $(CURDIR)/debian/tmp/
+freeradius_dir  = $(CURDIR)/debian/tmp
 
 mandir          = /usr/share/man
 libdir          = /usr/lib/$(package)

diff --git a/src/main/all.mk b/src/main/all.mk
index bcd546a..8629a13 100644 (file)
--- a/src/main/all.mk
+++ b/src/main/all.mk
@@ -1,3 +1,3 @@
-SUBMAKEFILES := radclient.mk radiusd.mk radsniff.mk radmin.mk radattr.mk \
-radconf2xml.mk radwho.mk radlast.mk radtest.mk radzap.mk checkrad.mk dhclient.mk
-
+SUBMAKEFILES := radclient.mk radiusd.mk radsniff.mk radmin.mk adattr.mk \
+radconf2xml.mk radwho.mk radlast.mk radtest.mk radzap.mk checkrad.mk \
+dhclient.mk
\ No newline at end of file

diff --git a/src/main/checkrad.mk b/src/main/checkrad.mk
index 3462a2c..fcbde8c 100644 (file)
--- a/src/main/checkrad.mk
+++ b/src/main/checkrad.mk
@@ -4,4 +4,4 @@ install: install.checkrad
 
 install.checkrad:
        @echo INSTALL checkrad
-       $(INSTALL) -m 755 src/main/checkrad $(R)$(sbindir)
\ No newline at end of file
+       @$(INSTALL) -m 755 src/main/checkrad $(R)$(sbindir)
\ No newline at end of file

diff --git a/src/main/radlast.mk b/src/main/radlast.mk
index 6a93ba8..3d69408 100644 (file)
--- a/src/main/radlast.mk
+++ b/src/main/radlast.mk
@@ -4,4 +4,4 @@ install: install.radlast
 
 install.radlast:
        @echo INSTALL radlast
-       $(INSTALL) -m 755 src/main/radlast $(R)$(bindir)
\ No newline at end of file
+       @$(INSTALL) -m 755 src/main/radlast $(R)$(bindir)
\ No newline at end of file

diff --git a/src/main/radtest.mk b/src/main/radtest.mk
index 401bf64..e08b4ca 100644 (file)
--- a/src/main/radtest.mk
+++ b/src/main/radtest.mk
@@ -4,4 +4,4 @@ install: install.radtest
 
 install.radtest:
        @echo INSTALL radtest
-       $(INSTALL) -m 755 src/main/radtest $(R)$(bindir)
\ No newline at end of file
+       @$(INSTALL) -m 755 src/main/radtest $(R)$(bindir)
\ No newline at end of file

diff --git a/src/main/radzap.mk b/src/main/radzap.mk
index 9f78d09..104d122 100644 (file)
--- a/src/main/radzap.mk
+++ b/src/main/radzap.mk
@@ -4,4 +4,4 @@ install: install.radzap
 
 install.radzap:
        @echo INSTALL radzap
-       $(INSTALL) -m 755 src/main/radzap $(R)$(bindir)
\ No newline at end of file
+       @$(INSTALL) -m 755 src/main/radzap $(R)$(bindir)
\ No newline at end of file

diff --git a/src/modules/rlm_dbm/rlm_dbm_parser.mk b/src/modules/rlm_dbm/rlm_dbm_parser.mk
index 21a616e..936d5b3 100644 (file)
--- a/src/modules/rlm_dbm/rlm_dbm_parser.mk
+++ b/src/modules/rlm_dbm/rlm_dbm_parser.mk
@@ -2,8 +2,8 @@
 # $Id$
 #
 
-SOURCES                := rlm_dbm_parser.c
 TARGET         := rlm_dbm_parser
+SOURCES                := rlm_dbm_parser.c
 TGT_PREREQS    := libfreeradius-radius.a
 
 SRC_CFLAGS     := $(rlm_dbm_CFLAGS)

diff --git a/src/modules/rlm_perl/Makefile.in b/src/modules/rlm_perl/Makefile.in
index 5e5fed1..59c5d4c 100644 (file)
--- a/src/modules/rlm_perl/Makefile.in
+++ b/src/modules/rlm_perl/Makefile.in
@@ -15,4 +15,4 @@ include ../rules.mak
 $(LT_OBJS): $(HEADERS)
 
 install-scripts:
-       $(INSTALL) -m 755 example.pl $(R)$(raddbdir)
+       @$(INSTALL) -m 755 src/modules/rlm_perl/example.pl $(R)$(raddbdir)

diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in
index f697657..b82e83c 100644 (file)
--- a/src/modules/rlm_perl/all.mk.in
+++ b/src/modules/rlm_perl/all.mk.in
@@ -8,3 +8,9 @@ SOURCES         = rlm_perl.c
 
 SRC_CFLAGS     = @perl_cflags@
 TGT_LDLIBS     = @perl_ldflags@
+
+install: install.rlm_perl.scripts
+
+.PHONY: install.rlm_perl.scripts
+install.rlm_perl.scripts:
+       @$(INSTALL) -m 755 src/modules/rlm_perl/example.pl $(R)$(raddbdir)