Git master branch & Debian build

[Olivier Beytrison]

On 20.11.2012 15:45, Alan DeKok wrote:
> Olivier Beytrison wrote:
>> Other changes broke the make install process.
> 
>   Whoops, typo.  I've pushed another fix.
Yep thanks, this issue is resolved.

make install is ok for the binaries.
Now it barfs right after installing dhclient (last reference in src/all.mk)

INSTALL radwho
INSTALL radlast
INSTALL radtest
INSTALL radzap
INSTALL checkrad
INSTALL dhclient
mkdir: cannot create directory
`/opt/src/freeradius/FR3/freeradius-server/debian/tmp/etc/freeradius':
File exists
make[1]: *** [install.dirs] Error 1
make[1]: Leaving directory `/opt/src/freeradius/FR3/freeradius-server'
make: *** [install-arch] Error 2
dpkg-buildpackage: error: debian/rules binary gave error exit status 2

And what's fun, debin/tmp/etc/freeradius is a file. a perl script.
example.pl from rlm_perl.

Bug introduced with commit 3298d3cc096cc2c5a76ab22388a154a0301b1897

Possible fix : move example.pl in ${docdir}/examples/example.pl


diff --git a/src/modules/rlm_perl/Makefile.in
b/src/modules/rlm_perl/Makefile.in
index 59c5d4c..04a1482 100644
--- 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 src/modules/rlm_perl/example.pl $(R)$(raddbdir)
+       @$(INSTALL) -m 755 src/modules/rlm_perl/example.pl
$(R)$(docdir)/examples/example.pl
diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in
index b82e83c..b582332 100644
--- a/src/modules/rlm_perl/all.mk.in
+++ b/src/modules/rlm_perl/all.mk.in
@@ -13,4 +13,4 @@ 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)
+       @$(INSTALL) -m 755 src/modules/rlm_perl/example.pl
$(R)$(docdir)/examples/example.pl

Olivier
-- 

 Olivier Beytrison
 Network & Security Engineer, HES-SO Fribourg
 Mobile: +41 (0)78 619 73 53
 Mail: olivier at heliosnet.org