Use normal escape routines, and not special ones.

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index f9365b6..5749199 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,8 @@ raddb/test.conf:
 $(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.raddb
        @$(MAKE) -C raddb/certs
        @printf "radiusd -C... "
-       @if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
-               @rm -f raddb/test.conf; \
+       @if ! FR_LIBRARY_PATH=./build/lib/local/.libs/ ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
+               rm -f raddb/test.conf; \
                cat $(BUILD_DIR)/tests/radiusd.config.log; \
                echo "fail"; \
                exit 1; \
@@ -52,19 +52,18 @@ $(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.r
        @echo "ok"
        @touch $@
 
-test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywords $(BUILD_DIR)/tests/radiusd-c | build.raddb
+test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.xlat tests.keywords tests.auth tests.modules $(BUILD_DIR)/tests/radiusd-c | build.raddb
        @$(MAKE) -C src/tests tests
 
 #  Tests specifically for Travis.  We do a LOT more than just
 #  the above tests
 ifneq "$(findstring travis,${prefix})" ""
 travis-test: raddb/test.conf test
-       @./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv -n test
+       @FR_LIBRARY_PATH=./build/lib/local/.libs/ ./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv -n test
        @rm -f raddb/test.conf
        @$(MAKE) install
        @perl -p -i -e 's/allow_vulnerable_openssl = no/allow_vulnerable_openssl = yes/' ${raddbdir}/radiusd.conf
        @${sbindir}/radiusd -XC
-       @$(MAKE) deb
 endif
 
 #
@@ -115,7 +114,16 @@ install.man: $(subst man/,$(R)$(mandir)/,$(MANFILES))
 
 $(R)$(mandir)/%: man/%
        @echo INSTALL $(notdir $<)
-       @$(INSTALL) -m 644 $< $@
+       @sed -e "s,/etc/raddb,$(raddbdir),g" \
+               -e "s,/usr/local/share,$(datarootdir),g" \
+               $< > $<.subst
+       @$(INSTALL) -m 644 $<.subst $@
+       @rm $<.subst
+
+#
+#  Don't install rlm_test
+#
+ALL_INSTALL := $(patsubst %rlm_test.la,,$(ALL_INSTALL))
 
 install: install.dirs install.share install.man