included DESTDIR support for easier packaging

diff --git a/Makefile.in b/Makefile.in
index 4a7140688045fc9de9533aa38d5da456b4a3004d..609ac553ba8b50a9f6581eb00fe4432a244b183c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,8 @@ distclean: clean
 
 install: all
        @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
-       @INSTALL@ -m 755 ulogd @sbindir@/ulogd
-       @INSTALL@ -m 600 ulogd.conf @sysconfdir@/ulogd.conf
+       @INSTALL@ -m 755 ulogd $(DESTDIR)@sbindir@/ulogd
+       @INSTALL@ -m 600 ulogd.conf $(DESTDIR)@sysconfdir@/ulogd.conf
        
 doc:
        $(MAKE) -C $@

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 9c7e9eba7ff3d6e5f7e7707d178f4af8ede20eda..4ec35b4e19cbeff520f619b0d4b6bc03d3f514ca 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -27,5 +27,5 @@ distclean:
        rm -f Makefile
 
 install: all
-       @INSTALL@ -m 755 -d $(ULOGD_LIB_PATH)
-       @INSTALL@ -m 755 *.so $(ULOGD_LIB_PATH)
+       @INSTALL@ -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
+       @INSTALL@ -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)

diff --git a/mysql/Makefile.in b/mysql/Makefile.in
index e716bb3dbd7452045305e385d942b60405c54970..0376c83237750cb3093c0d92279b821954f1ff51 100644 (file)
--- a/mysql/Makefile.in
+++ b/mysql/Makefile.in
@@ -26,5 +26,5 @@ distclean:
        rm -f Makefile
 
 install: all
-       @INSTALL@ -m 755 -d $(ULOGD_LIB_PATH)
-       @INSTALL@ -m 755 *.so $(ULOGD_LIB_PATH)
+       @INSTALL@ -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
+       @INSTALL@ -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)