X-Git-Url: http://git.onelab.eu/?p=distributedratelimiting.git;a=blobdiff_plain;f=Makefile.in;h=0358fd8028db31b362b58433d0a44b706adabe31;hp=618d44c1138feac89d2c63cf7d589c1016c7b9f8;hb=845a86c2059f50aef544fffde2534064d4048ed4;hpb=0be9704d6b24d09ebd55beedec52758cb88c570b

diff --git a/Makefile.in b/Makefile.in
index 618d44c..0358fd8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,9 +62,9 @@ recurse:
 	@for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
 
 ulogd: ulogd.c include/ulogd/ulogd.h ulogd.conf recurse
-	$(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LDFLAGS) $(LIBS) `xml2-config --libs`
+	$(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LDFLAGS) $(LIBS) $(XML_LDFLAGS)
 
-edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'
+edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g' -e 's,@etcdir\@,$(DESTDIR)$(ETCDIR),g'
 
 ulogd.conf: ulogd.conf.in
 	$(edit) ulogd.conf.in > ulogd.conf
@@ -80,6 +80,7 @@ install: all
 	@INSTALL@ -D -m 755 ulogd $(DESTDIR)$(BINDIR)/ulogd
 	@[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR)
 	@[ -f $(DESTDIR)$(ETCDIR)/ulogd.conf ] || @INSTALL@ -D -m 600 ulogd.conf $(DESTDIR)$(ETCDIR)/ulogd.conf
+	@[ -f $(DESTDIR)$(ETCDIR)/drl.xml ] || @INSTALL@ -D -m 600 drl.xml $(DESTDIR)$(ETCDIR)/drl.xml
 
 doc:
 	$(MAKE) -C $@