Undoing my earlier m4ification of module configuration. Ugh? Ugh.

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index 8f883fe..e63ed64 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 644 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; \
@@ -64,6 +64,12 @@ distclean: clean
        -find src/modules -name config.h | \
                while read file; do rm -f $$file; done
 
+ifndef prefix  # catch runs without configuring, and give helpful advice.
+Make.inc:
+       @echo "   Sorry!  You must run 'configure', before 'make'.";
+       @false
+endif
+
 ######################################################################
 #
 #  Automatic remaking rules suggested by info:autoconf#Automatic_Remaking