Applied patch from Chad Miller <cmiller@surfsouth.com>

	Add $(R) in front of install targets, so that the user can build
	a 'tar' image which will untar to the normal root, WITHOUT
	touching the root, or installing the module.  e.g.

	make R=/home/user/fake-root/ install

	will install everying to /home/user/fake-root/usr/bin
	/home/user/fake-root/etc, etc.

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

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index a1df9fc..87b48bb 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
+DESTDIR = $(R)
+
 if INSTALL_LTDL
 include_HEADERS = ltdl.h
 lib_LTLIBRARIES = libltdl.la

diff --git a/src/main/Makefile b/src/main/Makefile
index 458d99b..557d3a9 100644 (file)
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -123,13 +123,13 @@ clean:
                radclient radzap builddbm .libs
 
 install:
-       $(INSTALL) -d -m 755                    $(sbindir)
-       $(LIBTOOL) --mode=install $(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             $(bindir)
-       $(INSTALL) -m 755    radlast            $(bindir)
-       $(INSTALL) -m 755    radtest radclient  $(bindir)
-       $(INSTALL) -d -m 755                    $(logdir)
-       $(INSTALL) -d -m 755                    $(radacctdir)
+       $(INSTALL) -d -m 755                    $(R)$(sbindir)
+       $(LIBTOOL) --mode=install $(INSTALL) -m 755 -s radiusd  $(R)$(sbindir)
+       $(INSTALL) -m 755    checkrad.pl        $(R)$(sbindir)/checkrad
+       $(INSTALL) -d -m 755                    $(R)$(bindir)
+       $(INSTALL) -m 755 -s radwho raduse      $(R)$(bindir)
+       $(INSTALL) -m 755 -s radzap             $(R)$(bindir)
+       $(INSTALL) -m 755    radlast            $(R)$(bindir)
+       $(INSTALL) -m 755    radtest radclient  $(R)$(bindir)
+       $(INSTALL) -d -m 755                    $(R)$(logdir)
+       $(INSTALL) -d -m 755                    $(R)$(radacctdir)

diff --git a/src/modules/Makefile b/src/modules/Makefile
index fe934c8..d03a1dc 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -24,7 +24,7 @@ dynamic:
        @[$$USE_SHARED_LIBS = "yes" ] && $(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 
 install:
-       $(INSTALL) -d -m 755 $(libdir)
+       $(INSTALL) -d -m 755 $(R)$(libdir)
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 
 clean:

diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index d58bff6..4865457 100644 (file)
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -143,4 +143,4 @@ distclean:
 #  Otherwise, install the libraries into $(libdir)
 #
 install:
-       [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(libdir)/$(TARGET).la
+       [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/$(TARGET).la