changed hard-coded 'install' program to be $(INSTALL), so that

	we can pick up a working install from autoconf

diff --git a/Makefile b/Makefile
index 8f883fe..2aab2cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,20 +21,20 @@ clean:
 
 install:
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-       install -d -m 755       $(mandir);
+       $(INSTALL) -d -m 755    $(mandir);
        for i in 1 5 8; do \
-               install -d -m 755       $(mandir)/man$$i; \
-               install -m 444 man/man$$i/*.$$i $(mandir)/man$$i; \
+               $(INSTALL) -d -m 755    $(mandir)/man$$i; \
+               $(INSTALL) -m 444 man/man$$i/*.$$i $(mandir)/man$$i; \
        done
        @echo "Creating/updating files in $(raddbdir)"; \
-       install -d -m 755       $(raddbdir); \
+       $(INSTALL) -d -m 755    $(raddbdir); \
        cd raddb; \
        for i in [a-c]* [e-z]*; do \
                [ $$i != radiusd.conf.in -a ! -f $(raddbdir)/$$i ] && \
-                install -m 644 $$i $(raddbdir); \
+                $(INSTALL) -m 644 $$i $(raddbdir); \
        done; \
        for i in dictionary*; do \
-               [ ! -f $(raddbdir)/$$i ] && install -m 644 $$i $(raddbdir); \
+               [ ! -f $(raddbdir)/$$i ] && $(INSTALL) -m 644 $$i $(raddbdir); \
                if [ "`find $$i -newer $(raddbdir)/$$i`" ]; then \
                        echo "** $(raddbdir)/$$i"; \
                        nt=1; \

diff --git a/scripts/Makefile b/scripts/Makefile
index a48e46e..300b200 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -4,9 +4,9 @@ include ../Make.inc
 all:
 
 install:
-       install -m 755 rc.radiusd               $(sbindir)
-       install -m 755 radwatch                 $(sbindir)
-       install -m 755 check-radiusd-config     $(sbindir)
+       $(INSTALL) -m 755 rc.radiusd            $(sbindir)
+       $(INSTALL) -m 755 radwatch                      $(sbindir)
+       $(INSTALL) -m 755 check-radiusd-config  $(sbindir)
 
 clean:
 

diff --git a/src/main/Makefile b/src/main/Makefile
index 62b4ff5..520967e 100644 (file)
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -118,13 +118,13 @@ clean:
                radclient radzap builddbm .libs
 
 install:
-       install -d -m 755                       $(sbindir)
+       $(INSTALL) -d -m 755                    $(sbindir)
        $(LIBTOOL) install -m 755 -s radiusd    $(sbindir)
-       install -m 755    checkrad.pl           $(sbindir)/checkrad
-       install -d -m 755                       $(bindir)
-       install -m 755 -s radwho raduse         $(bindir)
-       install -m 755 -s radzap $(BUILDDBM)    $(bindir)
-       install -m 755    radlast               $(bindir)
-       install -m 755    radtest radclient     $(bindir)
-       install -d -m 755                       $(logdir)
-       install -d -m 755                       $(radacctdir)
+       $(INSTALL) -m 755    checkrad.pl        $(sbindir)/checkrad
+       $(INSTALL) -d -m 755                    $(bindir)
+       $(INSTALL) -m 755 -s radwho raduse      $(bindir)
+       $(INSTALL) -m 755 -s radzap $(BUILDDBM) $(bindir)
+       $(INSTALL) -m 755    radlast            $(bindir)
+       $(INSTALL) -m 755    radtest radclient  $(bindir)
+       $(INSTALL) -d -m 755                    $(logdir)
+       $(INSTALL) -d -m 755                    $(radacctdir)

diff --git a/src/modules/Makefile b/src/modules/Makefile
index 3eb7ed0..e2b6bc5 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -24,7 +24,7 @@ dynamic:
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 
 install:
-       install -d -m 755 $(libdir)
+       $(INSTALL) -d -m 755 $(libdir)
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 
 clean: